lean4monaco 1.0.46 → 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 "./vscode-lean4/vscode-lean4/src/infoview";
 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

@@ -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, };