refactor: move Features class to configuration.ts

Author: ashenBlade

src/configuration.ts

@@ -906,3 +906,81 @@ export async function openConfigFileCommand() {
 export async function refreshConfigCommand(config: Configuration) {
     await config.refreshConfig();
 };
+
+function version(ver: string): number {
+    /* 
+     * Search SemVer string in form
+     *
+     *      MAJOR.MINOR.PATCH
+     * 
+     * where PATCH may be missing.
+     * 
+     * We use regex because of suffixes that can be inside version string.
+     * Like: '1.90.0-insiders' or '1.89.2-prerelease'.
+     * So just split by '.' is not enough.
+     */
+    const parse = /(\d+)\.(\d+)(\.(\d+))?/.exec(ver);
+
+    if (!parse?.length) {
+        throw new Error(`Invalid SemVer string: ${ver}`);
+    }
+
+    let result = 0;
+
+    /* X.Y.Z - 1, 2, 4 indexes in regex */
+    result += parseInt(parse[1]) * 1000000;
+    result += parseInt(parse[2]) * 1000;
+
+    if (parse[4]) {
+        result += parseInt(parse[4]);
+    }
+
+    if (Number.isNaN(result)) {
+        throw new Error(`Invalid SemVer string: ${ver}. Result version number is NaN`);
+    }
+
+    return result;
+}
+
+/* 
+ * Various feature flags related to VS Code 
+ * functionality, that depends on API
+ */
+export class Features {
+    static versionAtLeast(ver: string) {
+        return version(ver) <= version(vscode.version);
+    }
+    static debugFocus: boolean | undefined = undefined;
+    static debugFocusEnabled() {
+        /* 
+         * Easily track debugger actions (breakpoints etc) and 
+         * selected call stack changes.
+         */
+        return this.debugFocus ??= this.versionAtLeast('1.90.0');
+    }
+
+    static arrayLengthFeature: boolean | undefined = undefined;
+    static hasEvaluateArrayLength() {
+        /*
+         * Evaluate array length in debugger like `arrayPtr, length`.
+         * This is only cppdbg feature.
+         */
+        if (this.arrayLengthFeature === undefined) {
+            const cppDbgExtension = vscode.extensions.getExtension('ms-vscode.cpptools');
+            if (cppDbgExtension?.packageJSON.version) {
+                const cppDbgVersion = version(cppDbgExtension.packageJSON.version);
+                this.arrayLengthFeature = version('1.13.0') <= cppDbgVersion;
+            } else {
+                /* Safe default */
+                this.arrayLengthFeature = false;
+            }
+        }
+        return this.arrayLengthFeature;
+    }
+
+    static hasLogOutputChannel() {
+        /* used only during initialization - do not have to save it */
+        return this.versionAtLeast('1.74.0');
+    }
+}
+

src/debugger.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import * as dap from "./dap";
-import { Features } from './utils';
+import { Features } from './configuration';
 import { PgVariablesViewProvider } from './variables';
 import {EvaluationError} from './error';
 

src/extension.ts

@@ -2,7 +2,6 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 
 import * as utils from './utils';
-import { Features } from './utils';
 import * as vars from './variables';
 import * as dbg from './debugger';
 import { Commands, 
@@ -11,7 +10,8 @@ import { Commands,
          VsCodeSettings,
          openConfigFileCommand,
          refreshConfigCommand,
-         setupConfiguration } from './configuration';
+         setupConfiguration,
+         Features } from './configuration';
 import { setupPgConfSupport } from './pgconf';
 import { PgindentDocumentFormatterProvider,
          setupFormatting } from './formatter';

src/logger.ts

@@ -1,7 +1,6 @@
 import { format } from 'util';
 import * as vscode from 'vscode';
-import * as utils from './utils';
-import { ExtensionPrettyName, VsCodeSettings } from './configuration';
+import { ExtensionPrettyName, VsCodeSettings, Features } from './configuration';
 
 interface ILogger {
     debug: (message: string, args: unknown[]) => void;
@@ -141,7 +140,7 @@ export function initLogger(context: vscode.ExtensionContext) {
 
     let outputChannel;
     let logger;    
-    if (utils.Features.hasLogOutputChannel()) {
+    if (Features.hasLogOutputChannel()) {
         outputChannel = vscode.window.createOutputChannel(extName, {log: true});
         logger = new VsCodeLogger(outputChannel);
     } else {

src/utils.ts

@@ -362,91 +362,3 @@ export function getPgSrcFile(...paths: string[]) {
 
     return path.join(...paths);
 }
-
-/**
- * Return integer representation of SemVer version string
- * 
- * @param ver Version string
- */
-export function version(ver: string): number {
-    /* 
-     * Search SemVer string in form
-     *
-     *      MAJOR.MINOR.PATCH
-     * 
-     * where PATCH may be missing.
-     * 
-     * We use regex because of suffixes that can be inside version string.
-     * Like: '1.90.0-insiders' or '1.89.2-prerelease'.
-     * So just split by '.' is not enough.
-     */
-    const parse = /(\d+)\.(\d+)(\.(\d+))?/.exec(ver);
-
-    if (!parse?.length) {
-        throw new Error(`Invalid SemVer string: ${ver}`);
-    }
-
-    let result = 0;
-
-    /* X.Y.Z - 1, 2, 4 indexes in regex */
-    result += parseInt(parse[1]) * 1000000;
-    result += parseInt(parse[2]) * 1000;
-
-    if (parse[4]) {
-        result += parseInt(parse[4]);
-    }
-
-    if (Number.isNaN(result)) {
-        throw new Error(`Invalid SemVer string: ${ver}. Result version number is NaN`);
-    }
-
-    return result;
-}
-
-/* 
- * Various feature flags related to VS Code 
- * functionality, that depends on API
- */
-let debugFocusEnabled: boolean | undefined = undefined;
-let hasArrayLengthFeature: boolean | undefined = undefined;
-let hasLogOutputChannel: boolean | undefined = undefined;
-
-export class Features {
-    static versionAtLeast(ver: string) {
-        return version(ver) <= version(vscode.version);
-    }
-
-    static debugFocusEnabled() {
-        /* 
-         * Easily track debugger actions (breakpoints etc) and 
-         * selected call stack changes 
-         */
-        if (debugFocusEnabled === undefined) {
-            debugFocusEnabled = this.versionAtLeast('1.90.0');
-        }
-        return debugFocusEnabled;
-    }
-
-    static hasEvaluateArrayLength() {
-        /* Evaluate array length in debugger like `arrayPtr, length' */
-        if (hasArrayLengthFeature === undefined) {
-            const cppDbgExtension = vscode.extensions.getExtension('ms-vscode.cpptools');
-            if (cppDbgExtension?.packageJSON.version) {
-                const cppDbgVersion = version(cppDbgExtension.packageJSON.version);
-                hasArrayLengthFeature = version('1.13.0') <= cppDbgVersion;
-            } else {
-                /* Safe default */
-                hasArrayLengthFeature = false;
-            }
-        }
-        return hasArrayLengthFeature;
-    }
-
-    static hasLogOutputChannel() {
-        if (hasLogOutputChannel === undefined) {
-            hasLogOutputChannel = this.versionAtLeast('1.74.0');
-        }
-
-        return hasLogOutputChannel;
-    }
-}