refactor: changed project layout to be more intuitive

Author: gnikit

src/features/commands.ts renamed to src/commands/commands.ts

@@ -5,15 +5,15 @@ 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 { 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 './features/hover-provider';
-import { FortranLintingProvider } from './features/linter-provider';
-import { EXTENSION_ID, FortranDocumentSelector } from './lib/tools';
+import { FortranHoverProvider } from './fallback-features/hover-provider';
+import { FortranLintingProvider } from './lint/linter-provider';
+import { EXTENSION_ID, FortranDocumentSelector } from './util/tools';
 import { getConfigLogLevel, Logger } from './services/logging';
-import { WhatsNew } from './features/commands';
+import { WhatsNew } from './commands/commands';
 
 // Make it global to catch errors when activation fails
 const logger = new Logger(

src/extension.ts

@@ -1,9 +1,9 @@
 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 { isPositionInString, FORTRAN_KEYWORDS } from '../util/helper';
+import { getDeclaredFunctions } from './functions';
+import { EXTENSION_ID } from '../util/tools';
 import { Logger } from '../services/logging';
 import intrinsics from './intrinsics.json';
 

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

@@ -4,9 +4,8 @@ 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,10 +1,8 @@
 'use strict';
 
-import * as fs from 'fs';
 import * as path from 'path';
-import * as which from 'which';
+import which from 'which';
 import * as vscode from 'vscode';
-import * as cp from 'child_process';
 
 import { Logger } from '../services/logging';
 import {
@@ -14,7 +12,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/lib/functions.ts renamed to src/fallback-features/functions.ts

@@ -10,7 +10,7 @@ import { glob } from 'glob';
 
 import * as pkg from '../../package.json';
 import { Logger } from '../services/logging';
-import { GNULinter, GNUModernLinter, IntelLinter, LFortranLinter, NAGLinter } from '../lib/linters';
+import { GNULinter, GNUModernLinter, IntelLinter, LFortranLinter, NAGLinter } from './linters';
 import {
   EXTENSION_ID,
   resolveVariables,
@@ -19,17 +19,17 @@ import {
   spawnAsPromise,
   isFortran,
   shellTask,
-} from '../lib/tools';
-import { arraysEqual } from '../lib/helper';
+} from '../util/tools';
+import { arraysEqual } from '../util/helper';
+import { GlobPaths } from '../util/glob-paths';
 import {
   BuildDebug,
   BuildRun,
   InitLint,
   CleanLintFiles,
   RescanLint,
   CleanLintDiagnostics,
-} from './commands';
-import { GlobPaths } from '../lib/glob-paths';
+} from '../commands/commands';
 
 const GNU = new GNULinter();
 const GNU_NEW = new GNUModernLinter();