Merge pull request #909 from fortran-lang/refactor/sources

Refactor extension layout

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/features/commands.ts renamed to src/commands/commands.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 { FortranCompletionProvider } from './features/completion-provider';
-import { FortranDocumentSymbolProvider } from './features/document-symbol-provider';
-import { FortranFormattingProvider } from './features/formatting-provider';
+import { WhatsNew } from './commands/commands';
+import { FortranCompletionProvider } from './fallback-features/completion-provider';
+import { FortranDocumentSymbolProvider } from './fallback-features/document-symbol-provider';
+import { FortranHoverProvider } from './fallback-features/hover-provider';
+import { FortranFormattingProvider } from './format/provider';
+import { FortranLintingProvider } from './lint/provider';
 import { FortlsClient } from './lsp/client';
-import { FortranHoverProvider } from './features/hover-provider';
-import { FortranLintingProvider } from './features/linter-provider';
-import { EXTENSION_ID, FortranDocumentSelector } from './lib/tools';
 import { getConfigLogLevel, Logger } from './services/logging';
-import { WhatsNew } from './features/commands';
+import { EXTENSION_ID, FortranDocumentSelector } from './util/tools';
 
 // Make it global to catch errors when activation fails
 const logger = new Logger(

src/extension.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 '../lib/helper';
-import { getDeclaredFunctions } from '../lib/functions';
-import { EXTENSION_ID } from '../lib/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/features/completion-provider.ts renamed to src/fallback-features/completion-provider.ts

@@ -1,12 +1,11 @@
 import { CancellationToken, TextDocument, TextLine, SymbolInformation } from 'vscode';
-
 import * as vscode from 'vscode';
+
 import {
   parseFunction as getDeclaredFunction,
   parseSubroutine as getDeclaredSubroutine,
-} from '../lib/functions';
-import { parseVars as getDeclaredVar } from '../lib/variables';
-import { EXTENSION_ID } from '../lib/tools';
+} from './functions';
+import { parseVars as getDeclaredVar } from './variables';
 
 type SymbolType = 'subroutine' | 'function' | 'variable';
 type ParserFunc = (document: TextDocument, line: TextLine) => SymbolInformation | undefined;

src/features/document-symbol-provider.ts renamed to src/fallback-features/document-symbol-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/lib/functions.ts renamed to src/fallback-features/functions.ts

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

src/features/hover-provider.ts renamed to src/fallback-features/hover-provider.ts

@@ -1,10 +1,9 @@
 'use strict';
 
-import * as fs from 'fs';
 import * as path from 'path';
-import * as which from 'which';
+
 import * as vscode from 'vscode';
-import * as cp from 'child_process';
+import which from 'which';
 
 import { Logger } from '../services/logging';
 import {
@@ -14,7 +13,7 @@ import {
   getWholeFileRange,
   spawnAsPromise,
   pathRelToAbs,
-} from '../lib/tools';
+} from '../util/tools';
 
 export class FortranFormattingProvider implements vscode.DocumentFormattingEditProvider {
   private readonly workspace = vscode.workspace.getConfiguration(EXTENSION_ID);

src/features/intrinsics.json renamed to src/fallback-features/intrinsics.json

@@ -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 '../lib/linters';
+import { GlobPaths } from '../util/glob-paths';
+import { arraysEqual } from '../util/helper';
 import {
   EXTENSION_ID,
   resolveVariables,
@@ -19,17 +29,9 @@ import {
   spawnAsPromise,
   isFortran,
   shellTask,
-} from '../lib/tools';
-import { arraysEqual } from '../lib/helper';
-import {
-  BuildDebug,
-  BuildRun,
-  InitLint,
-  CleanLintFiles,
-  RescanLint,
-  CleanLintDiagnostics,
-} from './commands';
-import { GlobPaths } from '../lib/glob-paths';
+} from '../util/tools';
+
+import { GNULinter, GNUModernLinter, IntelLinter, LFortranLinter, NAGLinter } from './compilers';
 
 const GNU = new GNULinter();
 const GNU_NEW = new GNUModernLinter();

src/lib/variables.ts renamed to src/fallback-features/variables.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,
@@ -14,9 +18,7 @@ import {
   getOuterMostWorkspaceFolder,
   pipInstall,
   resolveVariables,
-} from '../lib/tools';
-import { Logger } from '../services/logging';
-import { RestartLS } from '../features/commands';
+} from '../util/tools';
 
 // 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/features/formatting-provider.ts renamed to src/format/provider.ts

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

src/lib/linters.ts renamed to src/lint/compilers.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';

src/features/linter-provider.ts renamed to src/lint/provider.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