From 9f6c35b9ec6eb3187fcddce048aa1a9a29d3baaf Mon Sep 17 00:00:00 2001 From: Elio Struyf Date: Thu, 21 Apr 2022 12:49:56 +0200 Subject: [PATCH] Automatically set the recognized framework --- src/commands/Project.ts | 13 +++++++++++-- src/helpers/FrameworkDetector.ts | 1 - src/listeners/dashboard/SettingsListener.ts | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/commands/Project.ts b/src/commands/Project.ts index f5151f96..7ac4e5e0 100644 --- a/src/commands/Project.ts +++ b/src/commands/Project.ts @@ -5,7 +5,7 @@ import * as fs from "fs"; import { Notifications } from "../helpers/Notifications"; import { Template } from "./Template"; import { Folders } from "./Folders"; -import { Logger, Settings } from "../helpers"; +import { FrameworkDetector, Logger, Settings } from "../helpers"; import { SETTING_CONTENT_DEFAULT_FILETYPE, TelemetryEvent } from "../constants"; import { SettingsListener } from '../listeners/dashboard'; @@ -50,7 +50,16 @@ categories: [] Notifications.info("Project initialized successfully."); } - Telemetry.send(TelemetryEvent.initialization) + Telemetry.send(TelemetryEvent.initialization); + + + // Check if you can find the framework + const wsFolder = Folders.getWorkspaceFolder(); + const framework = FrameworkDetector.get(wsFolder?.fsPath || ""); + + if (framework) { + SettingsListener.setFramework(framework.name); + } SettingsListener.getSettings(); } catch (err: any) { diff --git a/src/helpers/FrameworkDetector.ts b/src/helpers/FrameworkDetector.ts index 9c2cf46a..6fee7a3d 100644 --- a/src/helpers/FrameworkDetector.ts +++ b/src/helpers/FrameworkDetector.ts @@ -1,7 +1,6 @@ import { existsSync, readFileSync } from "fs"; import { join, resolve } from "path"; import { FrameworkDetectors } from "../constants/FrameworkDetectors"; -import { Extension } from "./Extension"; export class FrameworkDetector { diff --git a/src/listeners/dashboard/SettingsListener.ts b/src/listeners/dashboard/SettingsListener.ts index 54d012f5..a5989f77 100644 --- a/src/listeners/dashboard/SettingsListener.ts +++ b/src/listeners/dashboard/SettingsListener.ts @@ -53,7 +53,7 @@ export class SettingsListener extends BaseListener { * Set the current site-generator or framework + related settings * @param frameworkId */ - private static setFramework(frameworkId: string | null) { + public static setFramework(frameworkId: string | null) { Settings.update(SETTING_FRAMEWORK_ID, frameworkId, true); if (frameworkId) {