Organize imports in ext tests

extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts

@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'mocha';
 import * as assert from 'assert';
+import 'mocha';
 import { join } from 'path';
-import { commands, workspace, window, Uri, Range, Position, ViewColumn } from 'vscode';
+import { commands, Position, Range, Uri, ViewColumn, window, workspace } from 'vscode';
 import { assertNoRpc } from '../utils';
 
 suite('vscode API - commands', () => {

extensions/vscode-api-tests/src/singlefolder-tests/configuration.test.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'mocha';
 import * as assert from 'assert';
+import 'mocha';
 import * as vscode from 'vscode';
 import { assertNoRpc } from '../utils';
 

extensions/vscode-api-tests/src/singlefolder-tests/debug.test.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { debug, workspace, Disposable, commands, window } from 'vscode';
-import { assertNoRpc, disposeAll } from '../utils';
 import { basename } from 'path';
+import { commands, debug, Disposable, window, workspace } from 'vscode';
+import { assertNoRpc, disposeAll } from '../utils';
 
 suite('vscode API - debug', function () {
 

extensions/vscode-api-tests/src/singlefolder-tests/editor.test.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { workspace, window, Position, Range, commands, TextEditor, TextDocument, TextEditorCursorStyle, TextEditorLineNumbersStyle, SnippetString, Selection, Uri, env } from 'vscode';
-import { createRandomFile, deleteFile, closeAllEditors, assertNoRpc } from '../utils';
+import { commands, env, Position, Range, Selection, SnippetString, TextDocument, TextEditor, TextEditorCursorStyle, TextEditorLineNumbersStyle, Uri, window, workspace } from 'vscode';
+import { assertNoRpc, closeAllEditors, createRandomFile, deleteFile } from '../utils';
 
 suite('vscode API - editors', () => {
 

extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { env, extensions, ExtensionKind, UIKind, Uri } from 'vscode';
+import { env, ExtensionKind, extensions, UIKind, Uri } from 'vscode';
 import { assertNoRpc } from '../utils';
 
 suite('vscode API - env', () => {

extensions/vscode-api-tests/src/singlefolder-tests/extensions.test.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'mocha';
 import * as assert from 'assert';
+import 'mocha';
 import * as vscode from 'vscode';
 
 suite('vscode server cli', () => {
@@ -14,7 +14,7 @@ suite('vscode server cli', () => {
 		const extension = process.env.TESTRESOLVER_INSTALL_BUILTIN_EXTENSION;
 		if (!process.env.BUILD_SOURCEVERSION // Skip it when running out of sources
 			|| !process.env.REMOTE_VSCODE // Skip it when not a remote integration test
-			||  !extension // Skip it when extension is not provided to server
+			|| !extension // Skip it when extension is not provided to server
 		) {
 			this.skip();
 		}

extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts

@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'mocha';
 import * as assert from 'assert';
-import * as vscode from 'vscode';
-import { createRandomFile, asPromise, disposeAll, closeAllEditors, revertAllDirty, saveAllEditors, assertNoRpc } from '../utils';
+import 'mocha';
 import { TextDecoder } from 'util';
+import * as vscode from 'vscode';
+import { asPromise, assertNoRpc, closeAllEditors, createRandomFile, disposeAll, revertAllDirty, saveAllEditors } from '../utils';
 
 async function createRandomNotebookFile() {
 	return createRandomFile('', undefined, '.vsctestnb');

extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { window, commands } from 'vscode';
+import { commands, window } from 'vscode';
 import { assertNoRpc, closeAllEditors } from '../utils';
 
 interface QuickPickExpected {

extensions/vscode-api-tests/src/singlefolder-tests/rpc.test.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertNoRpcFromEntry, assertNoRpc, disposeAll } from '../utils';
 import * as vscode from 'vscode';
+import { assertNoRpc, assertNoRpcFromEntry, disposeAll } from '../utils';
 
 suite('vscode', function () {
 

extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { window, Pseudoterminal, EventEmitter, TerminalDimensions, workspace, ConfigurationTarget, Disposable, UIKind, env, EnvironmentVariableMutatorType, EnvironmentVariableMutator, extensions, ExtensionContext, TerminalOptions, ExtensionTerminalOptions, Terminal } from 'vscode';
-import { doesNotThrow, equal, deepEqual, throws, strictEqual } from 'assert';
+import { deepEqual, doesNotThrow, equal, strictEqual, throws } from 'assert';
+import { ConfigurationTarget, Disposable, env, EnvironmentVariableMutator, EnvironmentVariableMutatorType, EventEmitter, ExtensionContext, extensions, ExtensionTerminalOptions, Pseudoterminal, Terminal, TerminalDimensions, TerminalOptions, UIKind, window, workspace } from 'vscode';
 import { assertNoRpc } from '../utils';
 
 // Disable terminal tests:

extensions/vscode-api-tests/src/singlefolder-tests/types.test.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'mocha';
 import * as assert from 'assert';
+import 'mocha';
 import * as vscode from 'vscode';
 import { assertNoRpc } from '../utils';
 

extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { workspace, window, commands, ViewColumn, TextEditorViewColumnChangeEvent, Uri, Selection, Position, CancellationTokenSource, TextEditorSelectionChangeKind, QuickPickItem, TextEditor, StatusBarAlignment } from 'vscode';
 import { join } from 'path';
-import { closeAllEditors, pathEquals, createRandomFile, assertNoRpc } from '../utils';
+import { CancellationTokenSource, commands, Position, QuickPickItem, Selection, StatusBarAlignment, TextEditor, TextEditorSelectionChangeKind, TextEditorViewColumnChangeEvent, Uri, ViewColumn, window, workspace } from 'vscode';
+import { assertNoRpc, closeAllEditors, createRandomFile, pathEquals } from '../utils';
 
 
 suite('vscode API - window', () => {

extensions/vscode-api-tests/src/singlefolder-tests/workspace.fs.test.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as vscode from 'vscode';
 import { posix } from 'path';
+import * as vscode from 'vscode';
 import { assertNoRpc } from '../utils';
 
 suite('vscode API - workspace-fs', () => {

extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { window, tasks, Disposable, TaskDefinition, Task, Task2, EventEmitter, CustomExecution, Pseudoterminal, TaskScope, commands, env, UIKind, ShellExecution, TaskExecution, Terminal, Event, workspace, ConfigurationTarget, TaskProcessStartEvent } from 'vscode';
+import { commands, ConfigurationTarget, CustomExecution, Disposable, env, Event, EventEmitter, Pseudoterminal, ShellExecution, Task, Task2, TaskDefinition, TaskExecution, TaskProcessStartEvent, tasks, TaskScope, Terminal, UIKind, window, workspace } from 'vscode';
 import { assertNoRpc } from '../utils';
 
 // Disable tasks tests:

extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts

@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as vscode from 'vscode';
-import { createRandomFile, deleteFile, closeAllEditors, pathEquals, rndName, disposeAll, testFs, delay, withLogDisabled, revertAllDirty, assertNoRpc } from '../utils';
-import { join, posix, basename } from 'path';
 import * as fs from 'fs';
+import { basename, join, posix } from 'path';
+import * as vscode from 'vscode';
 import { TestFS } from '../memfs';
+import { assertNoRpc, closeAllEditors, createRandomFile, delay, deleteFile, disposeAll, pathEquals, revertAllDirty, rndName, testFs, withLogDisabled } from '../utils';
 
 suite('vscode API - workspace', () => {
 

extensions/vscode-api-tests/src/utils.ts

@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as assert from 'assert';
 import * as vscode from 'vscode';
 import { TestFS } from './memfs';
-import * as assert from 'assert';
 
 export function rndName() {
 	return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 10);

extensions/vscode-api-tests/src/workspace-tests/workspace.test.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { join } from 'path';
 import * as vscode from 'vscode';
 import { closeAllEditors, pathEquals } from '../utils';
-import { join } from 'path';
 
 suite('vscode API - workspace', () => {
 

extensions/vscode-colorize-tests/src/colorizer.test.ts

@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'mocha';
 import * as assert from 'assert';
-import { commands, Uri } from 'vscode';
-import { join, normalize } from 'path';
 import * as fs from 'fs';
+import 'mocha';
+import { join, normalize } from 'path';
+import { commands, Uri } from 'vscode';
 
 function assertUnchangedTokens(fixturesPath: string, resultsPath: string, fixture: string, done: any) {
 	const testFixurePath = join(fixturesPath, fixture);

extensions/vscode-colorize-tests/src/colorizerTestMain.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
 import * as jsoncParser from 'jsonc-parser';
+import * as vscode from 'vscode';
 
 export function activate(context: vscode.ExtensionContext): any {