refactor: sort imports

Author: gnikit

.eslintrc.js

@@ -11,5 +11,14 @@ module.exports = {
     '@typescript-eslint/no-explicit-any': 0,
     '@typescript-eslint/explicit-module-boundary-types': 0,
     '@typescript-eslint/no-non-null-assertion': 0,
+
+    'import/order': [
+      'error',
+      {
+        'alphabetize': { order: 'asc' },
+        'newlines-between': 'always',
+        'groups': ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
+      },
+    ],
   },
 };

src/extension.ts

@@ -1,19 +1,21 @@
 'use strict';
 
+import * as fs from 'fs';
+import * as path from 'path';
+
 import * as vscode from 'vscode';
+
 import * as pkg from '../package.json';
-import * as path from 'path';
-import * as fs from 'fs';
 
+import { WhatsNew } from './commands/commands';
 import { FortranCompletionProvider } from './fallback-features/completion-provider';
 import { FortranDocumentSymbolProvider } from './fallback-features/document-symbol-provider';
-import { FortranFormattingProvider } from './format/formatting-provider';
-import { FortlsClient } from './lsp/client';
 import { FortranHoverProvider } from './fallback-features/hover-provider';
-import { FortranLintingProvider } from './lint/linter-provider';
-import { EXTENSION_ID, FortranDocumentSelector } from './util/tools';
+import { FortranFormattingProvider } from './format/provider';
+import { FortranLintingProvider } from './lint/provider';
+import { FortlsClient } from './lsp/client';
 import { getConfigLogLevel, Logger } from './services/logging';
-import { WhatsNew } from './commands/commands';
+import { EXTENSION_ID, FortranDocumentSelector } from './util/tools';
 
 // Make it global to catch errors when activation fails
 const logger = new Logger(

src/fallback-features/completion-provider.ts

@@ -1,10 +1,11 @@
-import { CancellationToken, TextDocument, Position, Hover } from 'vscode';
-import * as fs from 'fs';
 import * as vscode from 'vscode';
-import { isPositionInString, FORTRAN_KEYWORDS } from '../util/helper';
-import { getDeclaredFunctions } from './functions';
-import { EXTENSION_ID } from '../util/tools';
+import { Position, TextDocument } from 'vscode';
+
 import { Logger } from '../services/logging';
+import { FORTRAN_KEYWORDS, isPositionInString } from '../util/helper';
+import { EXTENSION_ID } from '../util/tools';
+
+import { getDeclaredFunctions } from './functions';
 import intrinsics from './intrinsics.json';
 
 class CaseCoverter {

src/fallback-features/document-symbol-provider.ts

@@ -1,6 +1,6 @@
 import { CancellationToken, TextDocument, TextLine, SymbolInformation } from 'vscode';
-
 import * as vscode from 'vscode';
+
 import {
   parseFunction as getDeclaredFunction,
   parseSubroutine as getDeclaredSubroutine,

src/fallback-features/hover-provider.ts

@@ -1,5 +1,7 @@
 import { CancellationToken, TextDocument, Position, Hover } from 'vscode';
+
 import { Logger } from '../services/logging';
+
 import intrinsics from './intrinsics.json';
 
 export class FortranHoverProvider {

src/fallback-features/variables.ts

@@ -1,5 +1,6 @@
 /* c8 ignore start */
 import * as vscode from 'vscode';
+
 import { Variable } from './functions';
 
 const varibleDecRegEx =

src/format/formatting-provider.ts renamed to src/format/provider.ts

@@ -1,8 +1,9 @@
 'use strict';
 
 import * as path from 'path';
-import which from 'which';
+
 import * as vscode from 'vscode';
+import which from 'which';
 
 import { Logger } from '../services/logging';
 import {

src/lint/linter-provider.ts renamed to src/lint/provider.ts

@@ -1,16 +1,26 @@
 'use strict';
 
+import * as cp from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
-import * as cp from 'child_process';
-import which from 'which';
+
+import { glob } from 'glob';
 import * as semver from 'semver';
 import * as vscode from 'vscode';
-import { glob } from 'glob';
+import which from 'which';
 
 import * as pkg from '../../package.json';
+import {
+  BuildDebug,
+  BuildRun,
+  InitLint,
+  CleanLintFiles,
+  RescanLint,
+  CleanLintDiagnostics,
+} from '../commands/commands';
 import { Logger } from '../services/logging';
-import { GNULinter, GNUModernLinter, IntelLinter, LFortranLinter, NAGLinter } from './linters';
+import { GlobPaths } from '../util/glob-paths';
+import { arraysEqual } from '../util/helper';
 import {
   EXTENSION_ID,
   resolveVariables,
@@ -20,16 +30,8 @@ import {
   isFortran,
   shellTask,
 } from '../util/tools';
-import { arraysEqual } from '../util/helper';
-import { GlobPaths } from '../util/glob-paths';
-import {
-  BuildDebug,
-  BuildRun,
-  InitLint,
-  CleanLintFiles,
-  RescanLint,
-  CleanLintDiagnostics,
-} from '../commands/commands';
+
+import { GNULinter, GNUModernLinter, IntelLinter, LFortranLinter, NAGLinter } from './linters';
 
 const GNU = new GNULinter();
 const GNU_NEW = new GNUModernLinter();

src/lsp/client.ts

@@ -1,11 +1,15 @@
 'use strict';
 
+import { spawnSync } from 'child_process';
 import * as os from 'os';
 import * as path from 'path';
+
 import * as vscode from 'vscode';
-import { spawnSync } from 'child_process';
 import { commands, window, workspace, TextDocument } from 'vscode';
 import { LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient/node';
+
+import { RestartLS } from '../commands/commands';
+import { Logger } from '../services/logging';
 import {
   EXTENSION_ID,
   FortranDocumentSelector,
@@ -15,8 +19,6 @@ import {
   pipInstall,
   resolveVariables,
 } from '../util/tools';
-import { Logger } from '../services/logging';
-import { RestartLS } from '../commands/commands';
 
 // The clients are non member variables of the class because they need to be
 // shared for command registration. The command operates on the client and not

src/services/logging.ts

@@ -1,4 +1,5 @@
 import { OutputChannel, window, workspace, WorkspaceConfiguration } from 'vscode';
+
 import { EXTENSION_ID } from '../util/tools';
 
 export enum LogLevel {

src/util/tools.ts

@@ -1,8 +1,10 @@
+import * as assert from 'assert';
+import * as cp from 'child_process';
 import * as os from 'os';
 import * as path from 'path';
+
 import * as vscode from 'vscode';
-import * as assert from 'assert';
-import * as cp from 'child_process';
+
 import { isString, isArrayOfString } from './helper';
 
 export const LS_NAME = 'fortls';

test/integration/index.ts

@@ -1,6 +1,7 @@
 import path from 'path';
-import Mocha from 'mocha';
+
 import { glob } from 'glob';
+import Mocha from 'mocha';
 
 export async function run(): Promise<void> {
   // Create the mocha test

test/integration/linter.test.ts

@@ -1,13 +1,15 @@
-import * as vscode from 'vscode';
-import * as path from 'path';
 import { strictEqual } from 'assert';
-import { FortranLintingProvider } from '../../src/lint/linter-provider';
+import * as path from 'path';
+
+import * as vscode from 'vscode';
+
 import {
   CleanLintDiagnostics,
   CleanLintFiles,
   InitLint,
   RescanLint,
 } from '../../src/commands/commands';
+import { FortranLintingProvider } from '../../src/lint/provider';
 
 suite('Linter', async () => {
   let doc: vscode.TextDocument;

test/integration/lsp-client.test.ts

@@ -1,9 +1,11 @@
-import * as vscode from 'vscode';
-import * as path from 'path';
 import { strictEqual } from 'assert';
+import * as path from 'path';
+
+import * as vscode from 'vscode';
+
 import { FortlsClient } from '../../src/lsp/client';
-import { delay } from '../../src/util/helper';
 import { Logger, LogLevel } from '../../src/services/logging';
+import { delay } from '../../src/util/helper';
 
 const logger = new Logger(
   vscode.window.createOutputChannel('Modern Fortran', 'log'),

test/integration/runTest.ts

@@ -1,11 +1,11 @@
+import { spawnSync } from 'child_process';
 import * as path from 'path';
 
 import {
   runTests,
   downloadAndUnzipVSCode,
   resolveCliArgsFromVSCodeExecutablePath,
 } from '@vscode/test-electron';
-import { spawnSync } from 'child_process';
 
 async function main() {
   try {

test/ui/install-prompts.test.ts

@@ -1,6 +1,7 @@
-import * as path from 'path';
 import { strictEqual } from 'assert';
 import { spawnSync } from 'child_process';
+import * as path from 'path';
+
 import { VSBrowser, WebDriver, Workbench } from 'vscode-extension-tester';
 
 describe('Download dependencies', () => {

test/unitTest/client.test.ts

@@ -1,6 +1,8 @@
-import * as vscode from 'vscode';
-import * as path from 'path';
 import { strictEqual } from 'assert';
+import * as path from 'path';
+
+import * as vscode from 'vscode';
+
 import { FortlsClient } from '../../src/lsp/client';
 import { Logger, LogLevel } from '../../src/services/logging';
 import { EXTENSION_ID } from '../../src/util/tools';

test/unitTest/document-system-provider.test.ts

@@ -1,6 +1,8 @@
+import { strictEqual } from 'assert';
 import * as path from 'path';
+
 import * as vscode from 'vscode';
-import { strictEqual } from 'assert';
+
 import { FortranDocumentSymbolProvider } from '../../src/fallback-features/document-symbol-provider';
 
 suite('Document Symbol Provider', () => {

test/unitTest/formatting-provider.test.ts

@@ -1,7 +1,9 @@
 import { strictEqual } from 'assert';
-import { FortranFormattingProvider } from '../../src/format/formatting-provider';
-import * as vscode from 'vscode';
 import * as path from 'path';
+
+import * as vscode from 'vscode';
+
+import { FortranFormattingProvider } from '../../src/format/provider';
 import { Logger, LogLevel } from '../../src/services/logging';
 
 const logger = new Logger(

test/unitTest/functions.test.ts

@@ -5,6 +5,7 @@
 
 // The module 'assert' provides assertion methods from node
 import * as assert from 'assert';
+
 import { validVariableName, parseFunction, parseArgs } from '../../src/fallback-features/functions';
 
 suite('function helper test', () => {

test/unitTest/helper.test.ts

@@ -1,4 +1,7 @@
 import { strictEqual } from 'assert';
+
+import * as vscode from 'vscode';
+
 import {
   isUri,
   isString,
@@ -11,7 +14,6 @@ import {
   arraysEqual,
   isPositionInString,
 } from '../../src/util/helper';
-import * as vscode from 'vscode';
 
 suite('helper functions isTypeVariable tests', () => {
   test('isUri', () => {

test/unitTest/index.ts

@@ -1,6 +1,7 @@
 import path from 'path';
-import Mocha from 'mocha';
+
 import { glob } from 'glob';
+import Mocha from 'mocha';
 
 export async function run(): Promise<void> {
   // Create the mocha test

test/unitTest/linter-provider.test.ts

@@ -1,5 +1,7 @@
-import * as path from 'path';
 import { strictEqual, deepStrictEqual } from 'assert';
+import * as path from 'path';
+
+import { glob } from 'glob';
 import {
   Diagnostic,
   DiagnosticSeverity,
@@ -11,18 +13,17 @@ import {
   TextDocument,
 } from 'vscode';
 // import * as fg from 'fast-glob';
-import { glob } from 'glob';
 
-import { FortranLintingProvider } from '../../src/lint/linter-provider';
 import {
   GNULinter,
   GNUModernLinter,
   IntelLinter,
   NAGLinter,
   LFortranLinter,
 } from '../../src/lint/linters';
-import { EXTENSION_ID, pipInstall } from '../../src/util/tools';
+import { FortranLintingProvider } from '../../src/lint/provider';
 import { Logger, LogLevel } from '../../src/services/logging';
+import { EXTENSION_ID, pipInstall } from '../../src/util/tools';
 
 const logger = new Logger(window.createOutputChannel('Modern Fortran', 'log'), LogLevel.DEBUG);
 

test/unitTest/logging.test.ts

@@ -1,4 +1,5 @@
 import { strictEqual } from 'assert';
+
 import { Logger, LogLevel, getConfigLogLevel } from '../../src/services/logging';
 
 suite('Logging', () => {

test/unitTest/runTest.ts

@@ -1,7 +1,7 @@
+import { spawnSync } from 'child_process';
 import * as path from 'path';
 
 import { runTests } from '@vscode/test-electron';
-import { spawnSync } from 'child_process';
 
 async function main() {
   try {

test/unitTest/tools.test.ts

@@ -1,6 +1,8 @@
-import * as path from 'path';
 import * as assert from 'assert';
+import * as path from 'path';
+
 import { Uri } from 'vscode';
+
 import { shellTask, spawnAsPromise, pathRelToAbs } from '../../src/util/tools';
 
 suite('Tools tests', () => {