microsoft · joyceerhl · Aug 1, 2019 · Jul 4, 2019 · Jul 4, 2019 · Jul 4, 2019
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,7 +7,6 @@
         "obj": true,
         "bin": true,
         "**/__pycache__": true,
-        "node_modules": true,
         "**/.mypy_cache/**": true,
         "**/.ropeproject/**": true
     },

diff --git a/build/ci/postInstall.js b/build/ci/postInstall.js
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const colors = require("colors/safe");
-const fs = require("fs");
-const path = require("path");
-const constants_1 = require("../constants");
+exports.__esModule = true;
+var colors = require("colors/safe");
+var fs = require("fs");
+var path = require("path");
+var constants_1 = require("../constants");
 /**
  * In order to compile the extension in strict mode, one of the dependencies (@jupyterlab) has some files that
  * just won't compile in strict mode.
@@ -14,23 +14,29 @@ const constants_1 = require("../constants");
  * The solution is to modify the type definition file after `npm install`.
  */
 function fixJupyterLabDTSFiles() {
-    const relativePath = path.join('node_modules', '@jupyterlab', 'coreutils', 'lib', 'settingregistry.d.ts');
-    const filePath = path.join(constants_1.ExtensionRootDir, relativePath);
+    var relativePath = path.join('node_modules', '@jupyterlab', 'services', 'node_modules', '@jupyterlab', 'coreutils', 'lib', 'settingregistry.d.ts');
+    var filePath = path.join(constants_1.ExtensionRootDir, relativePath);
     if (!fs.existsSync(filePath)) {
-        throw new Error(`Type Definition file from JupyterLab not found '${filePath}' (pvsc post install script)`);
+        throw new Error("Type Definition file from JupyterLab not found '" + filePath + "' (pvsc post install script)");
     }
-    const fileContents = fs.readFileSync(filePath, { encoding: 'utf8' });
+    var fileContents = fs.readFileSync(filePath, { encoding: 'utf8' });
     if (fileContents.indexOf('[key: string]: ISchema | undefined;') > 0) {
         // tslint:disable-next-line:no-console
-        console.log(colors.blue(`${relativePath} file already updated (by Python VSC)`));
+        console.log(colors.blue(relativePath + " file already updated (by Python VSC)"));
         return;
     }
-    const replacedText = fileContents.replace('[key: string]: ISchema;', '[key: string]: ISchema | undefined;');
-    if (fileContents === replacedText) {
-        throw new Error('Fix for JupyterLabl file \'settingregistry.d.ts\' failed (pvsc post install script)');
+    if (fileContents.indexOf('[key: string]: ISchema;') > 0) {
+        var replacedText = fileContents.replace('[key: string]: ISchema;', '[key: string]: ISchema | undefined;');
+        if (fileContents === replacedText) {
+            throw new Error('Fix for JupyterLabl file \'settingregistry.d.ts\' failed (pvsc post install script)');
+        }
+        fs.writeFileSync(filePath, replacedText);
+        // tslint:disable-next-line:no-console
+        console.log(colors.green(relativePath + " file updated (by Python VSC)"));
+    }
+    else {
+        // tslint:disable-next-line:no-console
+        console.log(colors.red(relativePath + " file does not need updating."));
     }
-    fs.writeFileSync(filePath, replacedText);
-    // tslint:disable-next-line:no-console
-    console.log(colors.green(`${relativePath} file updated (by Python VSC)`));
 }
 fixJupyterLabDTSFiles();
diff --git a/build/ci/postInstall.ts b/build/ci/postInstall.ts
@@ -17,6 +17,9 @@ import { ExtensionRootDir } from '../constants';
  */
 function fixJupyterLabDTSFiles() {
     const relativePath = path.join(
+        'node_modules',
+        '@jupyterlab',
+        'services',
         'node_modules',
         '@jupyterlab',
         'coreutils',
@@ -36,13 +39,18 @@ function fixJupyterLabDTSFiles() {
         console.log(colors.blue(`${relativePath} file already updated (by Python VSC)`));
         return;
     }
-    const replacedText = fileContents.replace('[key: string]: ISchema;', '[key: string]: ISchema | undefined;');
-    if (fileContents === replacedText) {
-        throw new Error('Fix for JupyterLabl file \'settingregistry.d.ts\' failed (pvsc post install script)');
+    if (fileContents.indexOf('[key: string]: ISchema;') > 0) {
+        const replacedText = fileContents.replace('[key: string]: ISchema;', '[key: string]: ISchema | undefined;');
+        if (fileContents === replacedText) {
+            throw new Error('Fix for JupyterLabl file \'settingregistry.d.ts\' failed (pvsc post install script)');
+        }
+        fs.writeFileSync(filePath, replacedText);
+        // tslint:disable-next-line:no-console
+        console.log(colors.green(`${relativePath} file updated (by Python VSC)`));
+    } else {
+        // tslint:disable-next-line:no-console
+        console.log(colors.red(`${relativePath} file does not need updating.`));
     }
-    fs.writeFileSync(filePath, replacedText);
-    // tslint:disable-next-line:no-console
-    console.log(colors.green(`${relativePath} file updated (by Python VSC)`));
 }
 
 fixJupyterLabDTSFiles();
diff --git a/gulpfile.js b/gulpfile.js
@@ -72,7 +72,7 @@ gulp.task('compile', done => {
         .on('error', () => (failed = true))
         .js.pipe(gulp.dest('out'))
         .on('finish', () => (failed ? done(new Error('TypeScript compilation errors')) : done()));
-});
+    });
 
 gulp.task('precommit', done => run({ exitOnError: true, mode: 'staged' }, done));
 

diff --git a/news/1 Enhancements/6810.md b/news/1 Enhancements/6810.md
@@ -0,0 +1 @@
+Add code gathering tools