From d560d63f7479520adaac267e527349459b561d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Loi=CC=88c=20Correnson?= <loic.correnson@cea.fr>
Date: Mon, 4 Jan 2021 15:51:55 +0100
Subject: [PATCH] [ivette/eva] fix diffed typing
---
ivette/src/frama-c/eva/diffed.tsx | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/ivette/src/frama-c/eva/diffed.tsx b/ivette/src/frama-c/eva/diffed.tsx
index 9edf57ee95f..697bf6ce444 100644
--- a/ivette/src/frama-c/eva/diffed.tsx
+++ b/ivette/src/frama-c/eva/diffed.tsx
@@ -74,7 +74,7 @@ export class DiffBuffer {
getContents(): React.ReactNode {
this.flush();
- return <>{React.Children.toArray(this.contents)}</>;
+ return React.Children.toArray(this.contents);
}
getScratch() {
@@ -93,17 +93,16 @@ export interface Diff2Props {
diff: string;
}
-export function Diff2(props: Diff2Props): JSX.Element {
+export function Diff2(props: Diff2Props) {
const { text, diff } = props;
- const contents = React.useMemo(() => {
+ const contents = React.useMemo<React.ReactNode>(() => {
if (text === diff) return text;
const buffer = new DiffBuffer();
const chunks = diffChars(text, diff);
- // console.log('DIFF', text, diff, chunks);
chunks.forEach(buffer.push);
return buffer.getContents();
}, [text, diff]);
- return contents as JSX.Element;
+ return <>{contents}</>;
}
/* --------------------------------------------------------------------------*/
@@ -116,9 +115,9 @@ export interface Diff3Props {
diffB: string;
}
-export function Diff3(props: Diff3Props): JSX.Element {
+export function Diff3(props: Diff3Props) {
const { text, diffA, diffB } = props;
- const contents = React.useMemo(() => {
+ const contents = React.useMemo<React.ReactNode>(() => {
if (text === diffA && text === diffB) return text;
const buffer = new DiffBuffer();
diffChars(diffA, diffB).forEach(buffer.push);
@@ -127,7 +126,7 @@ export function Diff3(props: Diff3Props): JSX.Element {
diffChars(text, scratch).forEach(buffer.push);
return buffer.getContents();
}, [text, diffA, diffB]);
- return contents as JSX.Element;
+ return <>{contents}</>;
}
/* --------------------------------------------------------------------------*/
@@ -141,7 +140,7 @@ export interface DiffProps {
diffB?: string;
}
-export function Diff(props: DiffProps): JSX.Element {
+export function Diff(props: DiffProps) {
const { text, diff, diffA, diffB } = props;
if (text === diff) return <>{text}</>;
if (diff !== undefined)
@@ -154,7 +153,6 @@ export function Diff(props: DiffProps): JSX.Element {
return <Diff2 text={text} diff={diffA} />;
}
return <Diff3 text={text} diffA={diffA} diffB={diffB} />;
-
}
// --------------------------------------------------------------------------
--
GitLab