From f3c8ebfa5d79c32c3bcc3ce9a5e8243249e9c759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Loi=CC=88c=20Correnson?= <loic.correnson@cea.fr>
Date: Wed, 16 Mar 2022 16:34:48 +0100
Subject: [PATCH] [ivette/types] rebased on master
---
ivette/src/dome/main/dome.ts | 2 +-
ivette/src/frama-c/kernel/ASTview.tsx | 3 +--
ivette/src/renderer/Preferences.tsx | 7 +++++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ivette/src/dome/main/dome.ts b/ivette/src/dome/main/dome.ts
index 27477c686a9..4bf31f95ae2 100644
--- a/ivette/src/dome/main/dome.ts
+++ b/ivette/src/dome/main/dome.ts
@@ -224,7 +224,7 @@ function windowSyncSettings(event: IpcMainEvent): void {
ipcMain.on('dome.ipc.settings.sync', windowSyncSettings);
-function applyThemeSettings(settings: Store) {
+function applyThemeSettings(settings: Store): void {
const theme = settings['dome-color-theme'];
if (typeof (theme) === 'string') setNativeTheme(theme);
}
diff --git a/ivette/src/frama-c/kernel/ASTview.tsx b/ivette/src/frama-c/kernel/ASTview.tsx
index 69f38d5ca7f..9a503192784 100644
--- a/ivette/src/frama-c/kernel/ASTview.tsx
+++ b/ivette/src/frama-c/kernel/ASTview.tsx
@@ -31,17 +31,16 @@ import * as States from 'frama-c/states';
import * as RichText from 'frama-c/richtext';
import * as Dome from 'dome';
+import * as Settings from 'dome/data/settings';
import type { key } from 'dome/data/json';
import { RichTextBuffer } from 'dome/text/buffers';
import { Text } from 'dome/text/editors';
-import { TitleBar } from 'ivette';
import * as Preferences from 'ivette/prefs';
import * as Server from 'frama-c/server';
import * as States from 'frama-c/states';
import * as Utils from 'frama-c/utils';
-
import * as Ast from 'frama-c/kernel/api/ast';
import * as Properties from 'frama-c/kernel/api/properties';
import { getCallers, getDeadCode } from 'frama-c/plugins/eva/api/general';
diff --git a/ivette/src/renderer/Preferences.tsx b/ivette/src/renderer/Preferences.tsx
index 9ffdfa9537a..e587512dfc0 100644
--- a/ivette/src/renderer/Preferences.tsx
+++ b/ivette/src/renderer/Preferences.tsx
@@ -67,7 +67,7 @@ function ThemeFields(): JSX.Element {
// --- Editor Fields
// --------------------------------------------------------------------------
-function EditorFields() {
+function EditorFields(): JSX.Element {
const fontsize = Forms.useValid(
Settings.useGlobalSettings(IvettePrefs.EditorFontSize)
);
@@ -100,7 +100,10 @@ function EditorFields() {
// --------------------------------------------------------------------------
// --- Console Scrollback Forms
// --------------------------------------------------------------------------
-function ConsoleScrollbackFields(props: IvettePrefs.ConsoleScrollbackProps) {
+
+function ConsoleScrollbackFields(
+ props: IvettePrefs.ConsoleScrollbackProps
+): JSX.Element {
const scrollback = Forms.useDefined(Forms.useValid(
Settings.useGlobalSettings(props.scrollback),
));
--
GitLab