Organize imports (via TypeScript lint)

.vscode/settings.json

@@ -91,12 +91,14 @@
     "ensurepip",
     "github",
     "glxinfo",
+    "importlib",
     "ipython",
     "Keybord",
     "kisak",
     "laggy",
     "libglut",
     "libpango",
+    "logfile",
     "Logfile",
     "manim",
     "Manim",

src/export.ts

@@ -1,10 +1,12 @@
 import * as vscode from "vscode";
-import { window, TextDocument, CancellationToken, CodeLens } from "vscode";
+import { CancellationToken, CodeLens, TextDocument, window } from "vscode";
+import { Logger, Window } from "./logger";
+import { ManimClass } from "./pythonParsing";
 import {
-  MultiStepInput, toQuickPickItems, shouldResumeNoOp,
+  MultiStepInput,
+  shouldResumeNoOp,
+  toQuickPickItems,
 } from "./utils/multiStepQuickPickUtil";
-import { ManimClass } from "./pythonParsing";
-import { Logger, Window } from "./logger";
 import { waitNewTerminalDelay } from "./utils/terminal";
 
 class VideoQuality {

src/extension.ts

@@ -1,18 +1,17 @@
+import { EventEmitter } from "events";
 import * as vscode from "vscode";
 import { window } from "vscode";
-import { ManimShell, NoActiveShellError } from "./manimShell";
+import { exportScene, ExportSceneCodeLens } from "./export";
+import { Logger, LogRecorder, Window } from "./logger";
 import { ManimCell } from "./manimCell";
-import { previewManimCell, reloadAndPreviewManimCell, previewCode } from "./previewCode";
-import { startScene, exitScene } from "./startStopScene";
-import { exportScene } from "./export";
-import { Logger, Window, LogRecorder } from "./logger";
-import { registerWalkthroughCommands } from "./walkthrough";
-import { ExportSceneCodeLens } from "./export";
+import { ManimShell, NoActiveShellError } from "./manimShell";
 import { determineManimVersion } from "./manimVersion";
-import { setupTestEnvironment } from "./utils/testing";
-import { EventEmitter } from "events";
 import { applyWindowsPastePatch } from "./patches/applyPatches";
+import { previewCode, previewManimCell, reloadAndPreviewManimCell } from "./previewCode";
+import { exitScene, startScene } from "./startStopScene";
+import { setupTestEnvironment } from "./utils/testing";
 import { getBinaryPathInPythonEnv } from "./utils/venv";
+import { registerWalkthroughCommands } from "./walkthrough";
 
 export let manimNotebookContext: vscode.ExtensionContext;
 

src/logger.ts

@@ -1,10 +1,9 @@
-import * as vscode from "vscode";
-import { window } from "vscode";
-import { LogOutputChannel } from "vscode";
-import { waitUntilFileExists, revealFileInOS } from "./utils/fileUtil";
-import * as path from "path";
 import * as fs from "fs";
 import * as os from "os";
+import * as path from "path";
+import * as vscode from "vscode";
+import { LogOutputChannel, window } from "vscode";
+import { revealFileInOS, waitUntilFileExists } from "./utils/fileUtil";
 
 const LOGGER_NAME = "Manim Notebook";
 

src/manimCell.ts

@@ -1,6 +1,10 @@
 import * as vscode from "vscode";
-import { window, TextDocument, CancellationToken,
-  CodeLens, FoldingContext, FoldingRange } from "vscode";
+import {
+  CancellationToken,
+  CodeLens, FoldingContext, FoldingRange,
+  TextDocument,
+  window,
+} from "vscode";
 import { ManimCellRanges } from "./pythonParsing";
 
 export class ManimCell implements vscode.CodeLensProvider, vscode.FoldingRangeProvider {

src/patches/applyPatches.ts

@@ -1,6 +1,6 @@
+import { exec } from "child_process";
 import * as fs from "fs";
 import path from "path";
-import { exec } from "child_process";
 
 import { Logger, Window } from "../logger";
 

src/previewCode.ts

@@ -1,10 +1,10 @@
+import { EventEmitter } from "events";
 import * as vscode from "vscode";
 import { window } from "vscode";
-import { ManimShell } from "./manimShell";
-import { EventEmitter } from "events";
-import { ManimCellRanges } from "./pythonParsing";
 import { Logger, Window } from "./logger";
+import { ManimShell } from "./manimShell";
 import { hasUserMinimalManimVersionAndWarn } from "./manimVersion";
+import { ManimCellRanges } from "./pythonParsing";
 
 // \x0C: is Ctrl + L, which clears the terminal screen
 const PREVIEW_COMMAND = "\x0Ccheckpoint_paste()";

src/startStopScene.ts

@@ -1,9 +1,9 @@
 import * as vscode from "vscode";
-import { ManimShell, NoActiveShellError } from "./manimShell";
 import { window, workspace } from "vscode";
 import { Logger, Window } from "./logger";
-import { ManimClass } from "./pythonParsing";
+import { ManimShell, NoActiveShellError } from "./manimShell";
 import { hasUserMinimalManimVersion } from "./manimVersion";
+import { ManimClass } from "./pythonParsing";
 
 /**
  * Runs the `manimgl` command in the terminal, with the current cursor's

src/utils/fileUtil.ts

@@ -1,6 +1,6 @@
-import * as vscode from "vscode";
 import * as fs from "fs";
 import * as path from "path";
+import * as vscode from "vscode";
 
 /**
  * Waits until a file exists on the disk.

src/utils/multiStepQuickPickUtil.ts

@@ -1,5 +1,9 @@
 import {
-  QuickPickItem, window, Disposable, QuickInputButton, QuickInput, QuickInputButtons,
+  Disposable,
+  QuickInput,
+  QuickInputButton,
+  QuickInputButtons,
+  QuickPickItem, window,
 } from "vscode";
 
 export function toQuickPickItem(names: string): QuickPickItem {

src/utils/testing.ts

@@ -1,5 +1,5 @@
-import { window, Terminal, TerminalShellExecution } from "vscode";
 import * as path from "path";
+import { Terminal, TerminalShellExecution, window } from "vscode";
 import { stripAnsiCodes } from "./terminal";
 
 export function setupTestEnvironment() {

src/walkthrough.ts

@@ -1,8 +1,8 @@
-import * as vscode from "vscode";
-import { ExtensionContext, window, workspace, commands } from "vscode";
-import { Logger } from "./logger";
 import fs from "fs";
 import path from "path";
+import * as vscode from "vscode";
+import { commands, ExtensionContext, window, workspace } from "vscode";
+import { Logger } from "./logger";
 
 export function registerWalkthroughCommands(context: ExtensionContext) {
   const openSampleFileCommand = commands.registerCommand(

tests/activation.test.ts

@@ -1,15 +1,13 @@
-import { window, commands } from "vscode";
+import { commands, window } from "vscode";
 
-import { describe, it, before, afterEach } from "mocha";
+import { afterEach, before, describe, it } from "mocha";
 import * as sinon from "sinon";
 let expect: Chai.ExpectStatic;
 
+import { manimNotebookContext } from "../src/extension";
 import { Logger } from "../src/logger";
 import { applyWindowsPastePatch } from "../src/patches/applyPatches";
-import { manimNotebookContext } from "../src/extension";
 
-// eslint-disable-next-line no-unused-vars
-import * as manimNotebook from "../src/extension";
 import { onTerminalOutput } from "../src/utils/terminal";
 
 const MANIM_VERSION_STRING_REGEX = /v\d+\.\d+\.\d+/;

tests/preview.test.ts

@@ -1,8 +1,8 @@
-import { window, commands } from "vscode";
-import { describe, it, before } from "mocha";
+import { before, describe, it } from "mocha";
+import { commands, window } from "vscode";
+import { goToLine } from "./utils/editor";
 import { onAnyTerminalOutput } from "./utils/terminal";
 import { uriInWorkspace } from "./utils/testRunner";
-import { goToLine } from "./utils/editor";
 let expect: Chai.ExpectStatic;
 
 before(async () => {

tests/utils/editor.ts

@@ -1,4 +1,4 @@
-import { TextEditor, Selection } from "vscode";
+import { Selection, TextEditor } from "vscode";
 
 /**
  * Moves the cursor to the specified line number.

tests/utils/installManim.ts

@@ -1,5 +1,5 @@
-import { ManimInstaller } from "./manimInstaller";
 import * as path from "path";
+import { ManimInstaller } from "./manimInstaller";
 
 async function setupManimInstallation() {
   const baseFolder = process.cwd();

tests/utils/manimCaller.ts

@@ -1,5 +1,5 @@
-import { window } from "vscode";
 import * as path from "path";
+import { window } from "vscode";
 
 export class ManimCaller {
   public venvPath: string = "";

tests/utils/testRunner.ts

@@ -12,14 +12,14 @@
 // import as soon as possible
 import { activatedEmitter } from "../../src/extension";
 
-import * as path from "path";
-import Mocha from "mocha";
 import * as assert from "assert";
 import { globSync } from "glob";
+import Mocha from "mocha";
+import * as path from "path";
 import "source-map-support/register";
 import "./prototype";
 
-import { window, workspace, Uri, extensions } from "vscode";
+import { Uri, extensions, window, workspace } from "vscode";
 
 const WORKSPACE_ROOT: string = workspace.workspaceFolders![0].uri.fsPath;