lean4monaco 1.0.45 → 1.1.0

package/README.md

@@ -196,8 +196,19 @@ Some random errors we encountered. If you have more, please share them.
 * Warnings about `glob` and `inflight` come from `copyfiles`: see [copyfiles#132](https://github.com/calvinmetcalf/copyfiles/pull/132)
 * Warning about ` @types/cypress` comes from `cypress-iframe`
 
+
 ## Development
 
+### Beware of the Git Submodule
+
+This repo contains a submodule in `src/vscode-lean4`. So after cloning the repo and after pulling changes, run
+```
+git submodule update --init
+```
+to update the submodule as well.
+
+### Testing
+
 You can run
 
 ```
@@ -207,6 +218,70 @@ npm test
 
 for the automated cypress tests.
 
+### Merge upstream changes from the VSCode extension
+
+Here is how to get the latest changes from the VSCode extension:
+```
+cd src/vscode-lean4
+git remote add upstream https://github.com/leanprover/vscode-lean4.git
+git fetch upstream
+git merge upstream/master
+```
+If there are merge conflicts, resolve them.
+
+Make sure that the `@leanprover` packages (and possibly others?)
+listed under `dependencies` in `package.json` point to the same versions as the packages
+listed under `dependencies` in `src/vscode-lean4/package.json`. 
+
+Verify that the everything still works:
+```
+npm install
+npm test
+```
+
+Stage the submodule pointer to the new merge commit
+and if you made changes to `package.json`, stage `package.json` and `package-lock.json` as well:
+```
+cd ../..
+git add src/vscode-lean4 package.json package-lock.json
+```
+
+Commit your changes:
+```
+git commit -m "Merge upstream changes from vscode-lean4"
+```
+
+Push the new commits in the submodule and in the parent repo:
+```
+cd src/vscode/lean4
+git push
+cd ../..
+git push
+```
+
+### Publishing
+
+Increase the version number in `package.json`.
+
+Verify that the everything works:
+```
+npm install
+npm test
+```
+
+Publish:
+```
+npm publish
+```
+
+If it succeeded, commit the new version number:
+```
+git add package.json package-lock.json demo/package-lock.json
+git commit -m "Publish npm package"
+git push
+```
+
+
 ### Docker image
 
 There is a `Dockerfile` which defines an image where the server is run in a Linux container.

package/dist/css/custom.css

@@ -10,4 +10,10 @@ TODO: These might be superfluous if the styles from `vscode-lean4 were integrate
 
 .font-size-code-smaller {
   opacity: 0.6;
-}
+}
+
+/* Hide "Save current config to default config" button */
+.saveConfigButton,
+.saveConfigLineBreak {
+  display: none;
+}

package/dist/infowebview.d.ts

@@ -1,9 +1,8 @@
 import { EditorApi, InfoviewApi } from "@leanprover/infoview-api";
-import { InfoWebviewFactory, InfoWebview } from "lean4/src/infoview";
-import { Rpc } from "lean4/src/rpc";
+import { Rpc } from "./vscode-lean4/vscode-lean4/src/rpc";
 import { ViewColumn } from "vscode";
 import { IConfigurationService, IThemeService } from "vscode/services";
-export declare class IFrameInfoWebview implements InfoWebview {
+export declare class IFrameInfoWebview {
     private iframe;
     rpc: Rpc;
     visible: boolean;
@@ -14,7 +13,7 @@ export declare class IFrameInfoWebview implements InfoWebview {
     dispose(): void;
     reveal(viewColumn?: ViewColumn, preserveFocus?: boolean): void;
 }
-export declare class IFrameInfoWebviewFactory implements InfoWebviewFactory {
+export declare class IFrameInfoWebviewFactory {
     private themeService;
     private configurationService;
     private fontFiles;
@@ -22,7 +21,7 @@ export declare class IFrameInfoWebviewFactory implements InfoWebviewFactory {
     private iframe;
     constructor(themeService: IThemeService, configurationService: IConfigurationService, fontFiles: FontFace[]);
     setInfoviewElement(infoviewElement: HTMLElement): void;
-    make(editorApi: EditorApi, stylesheet: string, column: number): IFrameInfoWebview;
+    make(editorApi: EditorApi, stylesheet: string): IFrameInfoWebview;
     private updateCssVars;
     private apiThemeClassName;
     private initialHtml;

package/dist/infowebview.js

@@ -1,4 +1,4 @@
-import { Rpc } from "lean4/src/rpc";
+import { Rpc } from "./vscode-lean4/vscode-lean4/src/rpc";
 import { EventEmitter } from "vscode";
 import * as colorUtils from 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import { ColorScheme } from 'vscode/vscode/vs/platform/theme/common/theme';
@@ -36,7 +36,7 @@ export class IFrameInfoWebviewFactory {
     setInfoviewElement(infoviewElement) {
         this.infoviewElement = infoviewElement;
     }
-    make(editorApi, stylesheet, column) {
+    make(editorApi, stylesheet) {
         this.iframe = document.createElement("iframe");
         this.infoviewElement.append(this.iframe);
         this.iframe.contentWindow.document.open();
@@ -74,6 +74,7 @@ export class IFrameInfoWebviewFactory {
         return new IFrameInfoWebview(this.iframe, rpc);
     }
     updateCssVars() {
+        // See also https://github.com/microsoft/vscode/blob/main/src/vs/workbench/contrib/webview/browser/themeing.ts
         const theme = this.themeService.getColorTheme();
         const documentStyle = this.iframe.contentDocument?.documentElement.style;
         const colors = colorUtils.getColorRegistry().getColors();
@@ -91,7 +92,7 @@ export class IFrameInfoWebviewFactory {
         const editorFontSize = configuration.fontSize || EDITOR_FONT_DEFAULTS.fontSize;
         const linkUnderlines = this.configurationService.getValue('accessibility.underlineLinks');
         const styles = {
-            'vscode-font-family': '\'Droid Sans Mono\', Consolas, Menlo, Monaco, \'Courier New\', monospace',
+            'vscode-font-family': '-apple-system,BlinkMacSystemFont,Segoe WPC,Segoe UI,HelveticaNeue-Light,system-ui,Ubuntu,Droid Sans,sans-serif',
             'vscode-font-weight': 'normal',
             'vscode-font-size': '13px',
             'vscode-editor-font-family': editorFontFamily,
@@ -103,7 +104,6 @@ export class IFrameInfoWebviewFactory {
         for (const id in styles) {
             documentStyle?.setProperty(`--${id}`, styles[id]);
         }
-        documentStyle?.setProperty('font-family', '-apple-system,BlinkMacSystemFont,Segoe WPC,Segoe UI,HelveticaNeue-Light,system-ui,Ubuntu,Droid Sans,sans-serif');
         this.iframe.contentDocument?.documentElement.setAttribute('class', `${this.apiThemeClassName(theme)}`);
         this.fontFiles.map(font => {
             this.iframe.contentDocument?.fonts.add(font);
@@ -132,7 +132,7 @@ export class IFrameInfoWebviewFactory {
             color: var(--vscode-editor-foreground);
           }
         </style>
-        <link rel="stylesheet" href="${new URL('./vscode-lean4/lean4-infoview/src/infoview/index.css', import.meta.url)}">
+        <link rel="stylesheet" href="${new URL('../node_modules/@leanprover/infoview/dist/index.css', import.meta.url)}">
         <link rel="stylesheet" href="${new URL('./css/vscode_webview.css', import.meta.url)}">
         <link rel="stylesheet" href="${new URL('./css/custom.css', import.meta.url)}">
       </head>

package/dist/lean4-infoview/esm-shims/react-dom.d.ts

@@ -0,0 +1,5 @@
+/** @module See `rollup.config.js` for what this file does. */
+import * as ReactDOM from 'react-dom';
+import { createPortal, createRoot, findDOMNode, flushSync, hydrate, hydrateRoot, render, unmountComponentAtNode, unstable_batchedUpdates, unstable_renderSubtreeIntoContainer, version, __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED } from 'react-dom';
+export default ReactDOM;
+export { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, createPortal, createRoot, findDOMNode, flushSync, hydrate, hydrateRoot, render, unmountComponentAtNode, unstable_batchedUpdates, unstable_renderSubtreeIntoContainer, version, };

package/dist/lean4-infoview/esm-shims/react-jsx-runtime.d.ts

@@ -0,0 +1,5 @@
+/** @module See `rollup.config.js` for what this file does. */
+import * as Jsx from 'react/jsx-runtime';
+import { Fragment, jsx, jsxs } from 'react/jsx-runtime';
+export default Jsx;
+export { Fragment, jsx, jsxs };

package/dist/lean4-infoview/esm-shims/react.d.ts

@@ -0,0 +1,5 @@
+/** @module See `rollup.config.js` for what this file does. */
+import * as React from 'react';
+export default React;
+import { Children, cloneElement, Component, createContext, createElement, createFactory, createRef, forwardRef, Fragment, isValidElement, lazy, memo, Profiler, PureComponent, startTransition, StrictMode, Suspense, unstable_act, useCallback, useContext, useDebugValue, useDeferredValue, useEffect, useId, useImperativeHandle, useInsertionEffect, useLayoutEffect, useMemo, useReducer, useRef, useState, useSyncExternalStore, useTransition, version, __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED } from 'react';
+export { Children, Component, Fragment, Profiler, PureComponent, StrictMode, Suspense, __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, cloneElement, createContext, createElement, createFactory, createRef, forwardRef, isValidElement, lazy, memo, startTransition, unstable_act, useCallback, useContext, useDebugValue, useDeferredValue, useEffect, useId, useImperativeHandle, useInsertionEffect, useLayoutEffect, useMemo, useReducer, useRef, useState, useSyncExternalStore, useTransition, version, };

package/dist/{vscode-lean4/vscode-lean4/dist/lean4-infoview → lean4-infoview}/index.css

@@ -3886,217 +3886,6 @@ code, .code { font-family: Consolas, monaco, monospace; }
 }
 
 
-/*
-This file contains syntax highlighting themes for highlight.js,
-taken from https://unpkg.com/browse/@highlightjs/cdn-assets@11.10.0/styles/github.css (light)
-and https://unpkg.com/browse/@highlightjs/cdn-assets@11.10.0/styles/github-dark.css (dark)
-
-Unfortunately there is no way to retrieve theme colors from VSCode:
-https://github.com/Microsoft/vscode/issues/32813
-*/
-
-pre code.hljs {
-    display: block;
-}
-
-/*!
-  Theme: GitHub
-  Description: Light theme as seen on github.com
-  Author: github.com
-  Maintainer: @Hirse
-  Updated: 2021-05-15
-
-  Outdated base version: https://github.com/primer/github-syntax-light
-  Current colors taken from GitHub's CSS
-*/
-
-.hljs-doctag,
-.hljs-keyword,
-.hljs-meta .hljs-keyword,
-.hljs-template-tag,
-.hljs-template-variable,
-.hljs-type,
-.hljs-variable.language_ {
-    /* prettylights-syntax-keyword */
-    color: #d73a49;
-}
-.hljs-title,
-.hljs-title.class_,
-.hljs-title.class_.inherited__,
-.hljs-title.function_ {
-    /* prettylights-syntax-entity */
-    color: #6f42c1;
-}
-.hljs-attr,
-.hljs-attribute,
-.hljs-literal,
-.hljs-meta,
-.hljs-number,
-.hljs-operator,
-.hljs-variable,
-.hljs-selector-attr,
-.hljs-selector-class,
-.hljs-selector-id {
-    /* prettylights-syntax-constant */
-    color: #005cc5;
-}
-.hljs-regexp,
-.hljs-string,
-.hljs-meta .hljs-string {
-    /* prettylights-syntax-string */
-    color: #032f62;
-}
-.hljs-built_in,
-.hljs-symbol {
-    /* prettylights-syntax-variable */
-    color: #e36209;
-}
-.hljs-comment,
-.hljs-code,
-.hljs-formula {
-    /* prettylights-syntax-comment */
-    color: #6a737d;
-}
-.hljs-name,
-.hljs-quote,
-.hljs-selector-tag,
-.hljs-selector-pseudo {
-    /* prettylights-syntax-entity-tag */
-    color: #22863a;
-}
-.hljs-subst {
-    /* prettylights-syntax-storage-modifier-import */
-    color: #24292e;
-}
-.hljs-section {
-    /* prettylights-syntax-markup-heading */
-    color: #005cc5;
-    font-weight: bold;
-}
-.hljs-bullet {
-    /* prettylights-syntax-markup-list */
-    color: #735c0f;
-}
-.hljs-emphasis {
-    /* prettylights-syntax-markup-italic */
-    color: #24292e;
-    font-style: italic;
-}
-.hljs-strong {
-    /* prettylights-syntax-markup-bold */
-    color: #24292e;
-    font-weight: bold;
-}
-.hljs-addition {
-    /* prettylights-syntax-markup-inserted */
-    color: #22863a;
-    background-color: #f0fff4;
-}
-.hljs-deletion {
-    /* prettylights-syntax-markup-deleted */
-    color: #b31d28;
-    background-color: #ffeef0;
-}
-
-/*!
-  Theme: GitHub Dark
-  Description: Dark theme as seen on github.com
-  Author: github.com
-  Maintainer: @Hirse
-  Updated: 2021-05-15
-
-  Outdated base version: https://github.com/primer/github-syntax-dark
-  Current colors taken from GitHub's CSS
-*/
-
-.vscode-dark .hljs-doctag,
-.vscode-dark .hljs-keyword,
-.vscode-dark .hljs-meta .hljs-keyword,
-.vscode-dark .hljs-template-tag,
-.vscode-dark .hljs-template-variable,
-.vscode-dark .hljs-type,
-.vscode-dark .hljs-variable.language_ {
-    /* prettylights-syntax-keyword */
-    color: #ff7b72;
-}
-.vscode-dark .hljs-title,
-.vscode-dark .hljs-title.class_,
-.vscode-dark .hljs-title.class_.inherited__,
-.vscode-dark .hljs-title.function_ {
-    /* prettylights-syntax-entity */
-    color: #d2a8ff;
-}
-.vscode-dark .hljs-attr,
-.vscode-dark .hljs-attribute,
-.vscode-dark .hljs-literal,
-.vscode-dark .hljs-meta,
-.vscode-dark .hljs-number,
-.vscode-dark .hljs-operator,
-.vscode-dark .hljs-variable,
-.vscode-dark .hljs-selector-attr,
-.vscode-dark .hljs-selector-class,
-.vscode-dark .hljs-selector-id {
-    /* prettylights-syntax-constant */
-    color: #79c0ff;
-}
-.vscode-dark .hljs-regexp,
-.vscode-dark .hljs-string,
-.vscode-dark .hljs-meta .hljs-string {
-    /* prettylights-syntax-string */
-    color: #a5d6ff;
-}
-.vscode-dark .hljs-built_in,
-.vscode-dark .hljs-symbol {
-    /* prettylights-syntax-variable */
-    color: #ffa657;
-}
-.vscode-dark .hljs-comment,
-.vscode-dark .hljs-code,
-.vscode-dark .hljs-formula {
-    /* prettylights-syntax-comment */
-    color: #8b949e;
-}
-.vscode-dark .hljs-name,
-.vscode-dark .hljs-quote,
-.vscode-dark .hljs-selector-tag,
-.vscode-dark .hljs-selector-pseudo {
-    /* prettylights-syntax-entity-tag */
-    color: #7ee787;
-}
-.vscode-dark .hljs-subst {
-    /* prettylights-syntax-storage-modifier-import */
-    color: #c9d1d9;
-}
-.vscode-dark .hljs-section {
-    /* prettylights-syntax-markup-heading */
-    color: #1f6feb;
-    font-weight: bold;
-}
-.vscode-dark .hljs-bullet {
-    /* prettylights-syntax-markup-list */
-    color: #f2cc60;
-}
-.vscode-dark .hljs-emphasis {
-    /* prettylights-syntax-markup-italic */
-    color: #c9d1d9;
-    font-style: italic;
-}
-.vscode-dark .hljs-strong {
-    /* prettylights-syntax-markup-bold */
-    color: #c9d1d9;
-    font-weight: bold;
-}
-.vscode-dark .hljs-addition {
-    /* prettylights-syntax-markup-inserted */
-    color: #aff5b4;
-    background-color: #033a16;
-}
-.vscode-dark .hljs-deletion {
-    /* prettylights-syntax-markup-deleted */
-    color: #ffdcd7;
-    background-color: #67060c;
-}
-
 /* Some styles specific to the infoview. */
 
 html,
@@ -4148,14 +3937,20 @@ body {
     font-weight: normal;
 }
 
-.highlight-selected {
-    background-color: var(--vscode-editorOverviewRuler-rangeHighlightForeground) !important;
+/* Used to denote text highlighted by the pretty-print expression widget. */
+.highlightable {
+    border-radius: 2pt;
+    transition: background-color 100ms ease-in-out;
 }
 
 .highlight {
     background-color: var(--vscode-editor-selectionBackground) !important;
 }
 
+.highlight-selected {
+    background-color: var(--vscode-editorOverviewRuler-rangeHighlightForeground);
+}
+
 /* Interactive traces */
 .trace-line:hover {
     background-color: #dbeeff;

package/dist/lean4-infoview/index.d.ts

@@ -0,0 +1,16 @@
+import { MessageData } from '@leanprover/infoview-api';
+export * from '@leanprover/infoview-api';
+export { EditorContext, VersionContext } from './infoview/contexts';
+export { EditorConnection } from './infoview/editorConnection';
+export { GoalLocation, GoalsLocation, LocationsContext } from './infoview/goalLocation';
+export { InteractiveCode, InteractiveCodeProps } from './infoview/interactiveCode';
+export { renderInfoview } from './infoview/main';
+export { RpcContext } from './infoview/rpcSessions';
+export { ServerVersion } from './infoview/serverVersion';
+export { DynamicComponent, DynamicComponentProps, importWidgetModule, PanelWidgetProps } from './infoview/userWidget';
+export { DocumentPosition, mapRpcError, useAsync, useAsyncPersistent, useAsyncWithTrigger, useClientNotificationEffect, useClientNotificationState, useEvent, useEventResult, useServerNotificationEffect, useServerNotificationState, } from './infoview/util';
+export { MessageData };
+/** Display the given message data as interactive, pretty-printed text. */
+export declare function InteractiveMessageData({ msg }: {
+    msg: MessageData;
+}): import("react/jsx-runtime").JSX.Element;