Update prettier line length to 120 (from 180). (#10054)

As discussed with the team, we're going to try out a line length of 120. This change also removes all "prettier-ignore" directives.

Author: ericsnowcurrently

.prettierrc.js

@@ -1,6 +1,6 @@
 module.exports = {
     singleQuote: true,
-    printWidth: 180,
+    printWidth: 120,
     tabWidth: 4,
     overrides: [
         {

.vscode/settings.json

@@ -41,7 +41,7 @@
     "typescript.preferences.quoteStyle": "single",
     "javascript.preferences.quoteStyle": "single",
     "typescriptHero.imports.stringQuoteStyle": "'",
-    "prettier.printWidth": 180,
+    "prettier.printWidth": 120,
     "prettier.singleQuote": true,
     "editor.codeActionsOnSave": {
         "source.fixAll.eslint": true,
@@ -54,7 +54,8 @@
     "python.linting.flake8Enabled": true,
     "cucumberautocomplete.skipDocStringsFormat": true,
     "python.linting.flake8Args": [
-        "--max-line-length=120"
+        // Match what black does.
+        "--max-line-length=88"
     ],
     "typescript.preferences.importModuleSpecifier": "relative"
 }

build/ci/performance/checkPerformanceResults.js

@@ -7,7 +7,13 @@ const path = require('path');
 const constants = require('../../constants');
 
 const xmlFile = path.join(constants.ExtensionRootDir, 'test-results.xml');
-const performanceResultsFile = path.join(constants.ExtensionRootDir, 'build', 'ci', 'performance', 'performance-results.json');
+const performanceResultsFile = path.join(
+    constants.ExtensionRootDir,
+    'build',
+    'ci',
+    'performance',
+    'performance-results.json'
+);
 const errorMargin = 0.01;
 let failedTests = '';
 
@@ -40,12 +46,29 @@ fs.readFile(xmlFile, 'utf8', (xmlFileError, xmlData) => {
 
                             // compare the average result to the base JSON
                             if (testcase && avg > parseFloat(testcase.time) + errorMargin) {
-                                failedTests += 'Performance is slow in: ' + testcase.name + ', Benchmark time: ' + testcase.time + ', Average test time: ' + avg + '\n';
+                                failedTests +=
+                                    'Performance is slow in: ' +
+                                    testcase.name +
+                                    ', Benchmark time: ' +
+                                    testcase.time +
+                                    ', Average test time: ' +
+                                    avg +
+                                    '\n';
                             }
                         } else {
                             // compare the average result to the base JSON
-                            if (suite.testcase.name === result.name && avg > parseFloat(suite.testcase.time) + errorMargin) {
-                                failedTests += 'Performance is slow in: ' + testcase.name + ', Benchmark time: ' + testcase.time + ', Average test time: ' + avg + '\n';
+                            if (
+                                suite.testcase.name === result.name &&
+                                avg > parseFloat(suite.testcase.time) + errorMargin
+                            ) {
+                                failedTests +=
+                                    'Performance is slow in: ' +
+                                    testcase.name +
+                                    ', Benchmark time: ' +
+                                    testcase.time +
+                                    ', Average test time: ' +
+                                    avg +
+                                    '\n';
                             }
                         }
                     }

build/ci/postInstall.js

@@ -14,7 +14,16 @@ var constants_1 = require('../constants');
  * The solution is to modify the type definition file after `npm install`.
  */
 function fixJupyterLabDTSFiles() {
-    var relativePath = path.join('node_modules', '@jupyterlab', 'services', 'node_modules', '@jupyterlab', 'coreutils', 'lib', 'settingregistry.d.ts');
+    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)");

build/webpack/loaders/fixNodeFetch.js

@@ -6,7 +6,16 @@
 const path = require('path');
 const constants = require('../../constants');
 
-const nodeFetchIndexFile = path.join(constants.ExtensionRootDir, 'node_modules', '@jupyterlab', 'services', 'node_modules', 'node-fetch', 'lib', 'index.js');
+const nodeFetchIndexFile = path.join(
+    constants.ExtensionRootDir,
+    'node_modules',
+    '@jupyterlab',
+    'services',
+    'node_modules',
+    'node-fetch',
+    'lib',
+    'index.js'
+);
 // On windows replace `\` with `\\`, else we get an error in webpack (Module parse failed: Octal literal in strict mode).
 const nodeFetchFile = constants.isWindows ? nodeFetchIndexFile.replace(/\\/g, '\\\\') : nodeFetchIndexFile;
 

build/webpack/plugins/less-plugin-base64.js

@@ -32,7 +32,12 @@ class Base64Visitor {
     visitUrl(URLNode, visitArgs) {
         // Return two new nodes in the call. One that has the mime type and other with the node. The data-uri
         // evaluator will transform this into a base64 string
-        return new less.tree.Call('data-uri', [new Base64MimeTypeNode(), URLNode.value], URLNode.index || 0, URLNode.currentFileInfo);
+        return new less.tree.Call(
+            'data-uri',
+            [new Base64MimeTypeNode(), URLNode.value],
+            URLNode.index || 0,
+            URLNode.currentFileInfo
+        );
     }
 }
 /*

build/webpack/webpack.datascience-ui.config.builder.js

@@ -129,7 +129,10 @@ function buildConfiguration(isNotebook) {
                             // `module.resource` contains the absolute path of the file on disk.
                             // Look for `node_modules/monaco...`.
                             const path = require('path');
-                            return module.resource && module.resource.includes(`${path.sep}node_modules${path.sep}@nteract`);
+                            return (
+                                module.resource &&
+                                module.resource.includes(`${path.sep}node_modules${path.sep}@nteract`)
+                            );
                         }
                     },
                     // Bundling `plotly` with nteract isn't the best option, as this plotly alone is 6mb.
@@ -142,7 +145,9 @@ function buildConfiguration(isNotebook) {
                             // `module.resource` contains the absolute path of the file on disk.
                             // Look for `node_modules/monaco...`.
                             const path = require('path');
-                            return module.resource && module.resource.includes(`${path.sep}node_modules${path.sep}plotly`);
+                            return (
+                                module.resource && module.resource.includes(`${path.sep}node_modules${path.sep}plotly`)
+                            );
                         }
                     },
                     // Monaco is a monster. For SSH again, we pull this into a seprate bundle.
@@ -157,7 +162,9 @@ function buildConfiguration(isNotebook) {
                             // `module.resource` contains the absolute path of the file on disk.
                             // Look for `node_modules/monaco...`.
                             const path = require('path');
-                            return module.resource && module.resource.includes(`${path.sep}node_modules${path.sep}monaco`);
+                            return (
+                                module.resource && module.resource.includes(`${path.sep}node_modules${path.sep}monaco`)
+                            );
                         }
                     }
                 }

build/webpack/webpack.extension.dependencies.config.js

@@ -43,7 +43,9 @@ const config = {
         // 'find' the calling extension.
         new copyWebpackPlugin([{ from: './package.json', to: '.' }]),
         // onigasm requires our onigasm.wasm to be in node_modules
-        new copyWebpackPlugin([{ from: './node_modules/onigasm/lib/onigasm.wasm', to: './node_modules/onigasm/lib/onigasm.wasm' }])
+        new copyWebpackPlugin([
+            { from: './node_modules/onigasm/lib/onigasm.wasm', to: './node_modules/onigasm/lib/onigasm.wasm' }
+        ])
     ],
     resolve: {
         alias: {

pythonFiles/testing_tools/adapter/__main__.py

@@ -22,15 +22,20 @@
 
 
 def parse_args(
-    argv=sys.argv[1:], prog=sys.argv[0],
+    # the args to parse
+    argv=sys.argv[1:],
+    # the program name
+    prog=sys.argv[0],
 ):
     """
     Return the subcommand & tool to run, along with its args.
 
     This defines the standard CLI for the different testing frameworks.
     """
     parser = argparse.ArgumentParser(
-        description="Run Python testing operations.", prog=prog,
+        description="Run Python testing operations.",
+        prog=prog,
+        # ...
     )
     cmdsubs = parser.add_subparsers(dest="cmd")
 
@@ -72,7 +77,15 @@ def parse_args(
     return tool, cmd, ns, toolargs
 
 
-def main(toolname, cmdname, subargs, toolargs, _tools=TOOLS, _reporters=REPORTERS):
+def main(
+    toolname,
+    cmdname,
+    subargs,
+    toolargs,
+    # internal args (for testing):
+    _tools=TOOLS,
+    _reporters=REPORTERS,
+):
     try:
         tool = _tools[toolname]
     except KeyError:

pythonFiles/testing_tools/adapter/discovery.py

@@ -23,7 +23,11 @@
 
 
 def fix_nodeid(
-    nodeid, kind, rootdir=None, _fix_fileid=fix_fileid,  # *,
+    nodeid,
+    kind,
+    rootdir=None,
+    # *,
+    _fix_fileid=fix_fileid,
 ):
     if not nodeid:
         raise ValueError("missing nodeid")
@@ -58,7 +62,9 @@ def __getitem__(self, index):
     @property
     def parents(self):
         return sorted(
-            self._parents.values(), key=lambda p: (NORMCASE(p.root or p.name), p.id),
+            self._parents.values(),
+            # Sort by (name, id).
+            key=lambda p: (NORMCASE(p.root or p.name), p.id),
         )
 
     def reset(self):
@@ -73,12 +79,18 @@ def add_test(self, test, parents):
         # provided test and parents (from the test collector) are
         # properly generated.  However, we play it safe here.
         test = test._replace(
-            id=fix_nodeid(test.id, "test", test.path.root), parentid=parentid,
+            # Clean up the ID.
+            id=fix_nodeid(test.id, "test", test.path.root),
+            parentid=parentid,
         )
         self._tests.append(test)
 
     def _ensure_parent(
-        self, path, parents, _dirname=DIRNAME,  # *,
+        self,
+        path,
+        parents,
+        # *,
+        _dirname=DIRNAME,
     ):
         rootdir = path.root
         relpath = path.relfile

pythonFiles/testing_tools/adapter/pytest/_discovery.py

@@ -12,7 +12,12 @@
 
 
 def discover(
-    pytestargs=None, hidestdio=False, _pytest_main=pytest.main, _plugin=None, **_ignored
+    pytestargs=None,
+    hidestdio=False,
+    # *,
+    _pytest_main=pytest.main,
+    _plugin=None,
+    **_ignored
 ):
     """Return the results of test discovery."""
     if _plugin is None:
@@ -29,7 +34,7 @@ def discover(
         pass
     elif ec != 0:
         print(
-            ("equivalent command: {} -m pytest {}").format(
+            "equivalent command: {} -m pytest {}".format(
                 sys.executable, util.shlex_unsplit(pytestargs)
             )
         )
@@ -39,7 +44,7 @@ def discover(
         raise Exception("pytest discovery failed (exit code {})".format(ec))
     if not _plugin._started:
         print(
-            ("equivalent command: {} -m pytest {}").format(
+            "equivalent command: {} -m pytest {}".format(
                 sys.executable, util.shlex_unsplit(pytestargs)
             )
         )