From 918b99d7414a2a6042a21e85421b84ee0f87f5bd Mon Sep 17 00:00:00 2001 From: duanfuxiang Date: Mon, 6 Jan 2025 16:44:35 +0800 Subject: [PATCH] fix: settings check && status ui bar --- src/core/autocomplete/states/state.ts | 3 ++- src/event-listener.ts | 2 +- src/types/settings.ts | 2 +- src/utils/auto-complete.ts | 6 +++--- styles.css | 6 +++--- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/core/autocomplete/states/state.ts b/src/core/autocomplete/states/state.ts index b37210f..df2e880 100644 --- a/src/core/autocomplete/states/state.ts +++ b/src/core/autocomplete/states/state.ts @@ -16,7 +16,8 @@ abstract class State implements EventHandler { } handleSettingChanged(settings: InfioSettings): void { - const settingErrors = checkForErrors(settings); + const settingErrors = checkForErrors(settings); + console.log(settingErrors); if (!settings.autocompleteEnabled) { new Notice("Copilot is now disabled."); this.context.transitionToDisabledManualState() diff --git a/src/event-listener.ts b/src/event-listener.ts index 39f19ee..4fcdc51 100644 --- a/src/event-listener.ts +++ b/src/event-listener.ts @@ -212,7 +212,7 @@ class EventListener implements EventHandler { } getStatusBarText(): string { - return `Copilot: ${this.state.getStatusBarText()}`; + return `autocomplete: ${this.state.getStatusBarText()}`; } handleSettingChanged(settings: InfioSettings): void { diff --git a/src/types/settings.ts b/src/types/settings.ts index b9e6be6..18a3f4c 100644 --- a/src/types/settings.ts +++ b/src/types/settings.ts @@ -57,7 +57,7 @@ export const triggerSchema = z.object({ } }); -const InfioSettingsSchema = z.object({ +export const InfioSettingsSchema = z.object({ // Version version: z.literal(SETTINGS_SCHEMA_VERSION).catch(SETTINGS_SCHEMA_VERSION), diff --git a/src/utils/auto-complete.ts b/src/utils/auto-complete.ts index 484e7a9..e23494e 100644 --- a/src/utils/auto-complete.ts +++ b/src/utils/auto-complete.ts @@ -4,15 +4,15 @@ import * as mm from "micromatch"; import { err, ok, Result } from "neverthrow"; import { z, ZodError, ZodIssueCode, ZodType } from 'zod'; -import { DEFAULT_SETTINGS, PluginData, Settings, settingsSchema } from "../settings/versions"; +import { DEFAULT_SETTINGS, PluginData, Settings } from "../settings/versions"; import { isSettingsV0, isSettingsV1, migrateFromV0ToV1 } from "../settings/versions/migration"; -import { InfioSettings } from '../types/settings'; +import { InfioSettings, InfioSettingsSchema } from '../types/settings'; type JSONObject = Record; export function checkForErrors(settings: InfioSettings) { const errors = new Map(); - const parsingResult = parseWithSchema(settingsSchema, settings); + const parsingResult = parseWithSchema(InfioSettingsSchema, settings); if (parsingResult.isOk()) { return errors; diff --git a/styles.css b/styles.css index e2260fb..786351e 100644 --- a/styles.css +++ b/styles.css @@ -268,7 +268,7 @@ button:not(.clickable-icon).infio-chat-list-dropdown { display: flex; flex-direction: column; -webkit-app-region: no-drag; - background: var(--background-modifier-form-field); + background: var(--background-secondary-alt); border: var(--input-border-width) solid var(--background-modifier-border); color: var(--text-normal); font-family: inherit; @@ -1252,8 +1252,8 @@ input[type='text'].infio-chat-list-dropdown-item-title-input { } .infio-ai-block-container { - background: var(--background-primary); - border-radius: 6px; + background: var(--background-secondary-alt); + border-radius: 4px; padding: 0px; border: 1px solid var(--background-modifier-border); }