split into main goal and other goals

client/src/components/infoview/goals.tsx

@@ -147,7 +147,7 @@ export const Goal = React.memo((props: GoalProps) => {
     const assumptionHyps = hyps.filter(hyp => hyp.isAssumption)
 
     return <div className={cn}>
-        {goal.userName && <div><strong className="goal-case">case </strong>{goal.userName}</div>}
+        {/* {goal.userName && <div><strong className="goal-case">case </strong>{goal.userName}</div>} */}
         {filter.reverse && goalLi}
         { objectHyps.length > 0 &&
             <div className="hyp-group"><div className="hyp-group-title">Objects:</div>

client/src/components/infoview/hints.tsx

@@ -11,15 +11,13 @@ export function Hints({hints} : {hints: GameHint[]}) {
 
 
   const [showHints, setShowHints] = React.useState(false);
-  const hasHints = hints.length > 0
-
 
   const openHints = hints.filter(hint => !hint.hidden)
   const hiddenHints = hints.filter(hint => hint.hidden)
 
   return <>
     {openHints.map(hint => <Hint hint={hint} />)}
-    {hasHints &&
+    {hiddenHints.length > 0 &&
         <FormControlLabel
           control={<Switch checked={showHints} onChange={() => setShowHints((prev) => !prev)} />}
           label="More Help?"

client/src/components/infoview/info.tsx

@@ -3,11 +3,11 @@
 import * as React from 'react';
 import type { Location, Diagnostic } from 'vscode-languageserver-protocol';
 
-import { goalsToString, Goals, FilteredGoals } from './goals'
+import { goalsToString, Goal, FilteredGoals } from './goals'
 import { basename, DocumentPosition, RangeHelpers, useEvent, usePausableState, discardMethodNotFound,
     mapRpcError, useAsyncWithTrigger, PausableProps } from '../../../../node_modules/lean4-infoview/src/infoview/util';
 import { ConfigContext, EditorContext, LspDiagnosticsContext, ProgressContext } from '../../../../node_modules/lean4-infoview/src/infoview/contexts';
-import { lspDiagToInteractive, MessagesList } from './messages';
+import { AllMessages, lspDiagToInteractive, MessagesList } from './messages';
 import { getInteractiveTermGoal, InteractiveDiagnostic,
     UserWidgetInstance, Widget_getWidgets, RpcSessionAtPos, isRpcError,
     RpcErrorCode, getInteractiveDiagnostics, InteractiveTermGoal } from '@leanprover/infoview-api';
@@ -110,6 +110,8 @@ const InfoDisplayContent = React.memo((props: InfoDisplayContentProps) => {
         subexprTemplate: undefined
     }), [selectedLocs])
 
+    const goalFilter = { reverse: false, showType: true, showInstance: true, showHiddenAssumption: true, showLetValue: true }
+
     /* Adding {' '} to manage string literals properly: https://reactjs.org/docs/jsx-in-depth.html#string-literals-1 */
     return <>
         {hasError &&
@@ -118,10 +120,10 @@ const InfoDisplayContent = React.memo((props: InfoDisplayContentProps) => {
                 <a className='link pointer dim' onClick={e => { e.preventDefault(); void triggerUpdate(); }}>{' '}Try again.</a>
             </div>}
         <LocationsContext.Provider value={locs}>
-            {goals && <Goals filter={{ reverse: false, showType: true, showInstance: true, showHiddenAssumption: true, showLetValue: true }} key='goals' goals={goals} />}
+            {goals && goals.goals.length > 0 && <Goal filter={goalFilter} key='mainGoal' goal={goals.goals[0]} />}
         </LocationsContext.Provider>
-        <FilteredGoals headerChildren='Expected type' key='term-goal'
+        {/* <FilteredGoals headerChildren='Expected type' key='term-goal'
-            goals={termGoal !== undefined ? {goals: [{...termGoal, hints: []}]} : undefined} />
+            goals={termGoal !== undefined ? {goals: [{...termGoal, hints: []}]} : undefined} /> */}
         {userWidgets.map(widget =>
             <details key={`widget::${widget.id}::${widget.range?.toString()}`} open>
                 <summary className='mv2 pointer'>{widget.name}</summary>
@@ -145,7 +147,11 @@ const InfoDisplayContent = React.memo((props: InfoDisplayContentProps) => {
                     {' '}or <a className='link pointer dim' onClick={e => { e.preventDefault(); setPaused(false); }}>resume updating</a>
                     {' '}to see information.
                 </span> :
-                'Loading goal...')}
+                <div>Loading goal...</div>)}
+        <AllMessages uri={pos.uri} />
+        <LocationsContext.Provider value={locs}>
+            {goals && goals.goals.slice(1).map((goal, i) => <Goal filter={goalFilter} key={i} goal={goal} />)}
+        </LocationsContext.Provider>
     </>
 })
 

client/src/components/infoview/main.tsx

@@ -62,9 +62,6 @@ export function Main(props: {}) {
     } else {
         ret = <div className="ma1 infoview vscode-light">
             <Infos />
-            {curUri && <div className="mv2">
-                <AllMessages uri={curUri} />
-            </div>}
         </div>
     }
 

client/src/components/infoview/messages.tsx

@@ -150,7 +150,7 @@ export function AllMessages({uri: uri0}: { uri: DocumentUri }) {
 function AllMessagesBody({uri, messages}: {uri: DocumentUri, messages: () => Promise<InteractiveDiagnostic[]>}) {
     const [msgs, setMsgs] = React.useState<InteractiveDiagnostic[] | undefined>(undefined)
     React.useEffect(() => { void messages().then(setMsgs) }, [messages])
-    if (msgs === undefined) return <>Loading messages...</>
+    if (msgs === undefined) return <div>Loading messages...</div>
     else return <MessagesList uri={uri} messages={msgs}/>
 }