lean4monaco 1.0.42 → 1.0.45

package/README.md

@@ -174,7 +174,7 @@ Afterwards, you can run the demo with
 ```
 cd lean4monaco
 npm install
-npm run setup_demo # this builds lean4monaco and calls `npm install` in `demo/`
+npm run demo:setup # this builds lean4monaco and calls `npm install` in `demo/`
 npm start
 ```
 

package/dist/infowebview.d.ts

@@ -1,6 +1,6 @@
 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 { InfoWebviewFactory, InfoWebview } from "lean4/src/infoview";
+import { Rpc } from "lean4/src/rpc";
 import { ViewColumn } from "vscode";
 import { IConfigurationService, IThemeService } from "vscode/services";
 export declare class IFrameInfoWebview implements InfoWebview {
@@ -20,8 +20,6 @@ export declare class IFrameInfoWebviewFactory implements InfoWebviewFactory {
     private fontFiles;
     private infoviewElement;
     private iframe;
-    rpc: Rpc;
-    editorApi: EditorApi;
     constructor(themeService: IThemeService, configurationService: IConfigurationService, fontFiles: FontFace[]);
     setInfoviewElement(infoviewElement: HTMLElement): void;
     make(editorApi: EditorApi, stylesheet: string, column: number): IFrameInfoWebview;

package/dist/infowebview.js

@@ -1,4 +1,4 @@
-import { Rpc } from "./vscode-lean4/vscode-lean4/src/rpc";
+import { Rpc } from "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';
@@ -28,8 +28,6 @@ export class IFrameInfoWebviewFactory {
     fontFiles;
     infoviewElement;
     iframe;
-    rpc;
-    editorApi;
     constructor(themeService, configurationService, fontFiles) {
         this.themeService = themeService;
         this.configurationService = configurationService;
@@ -39,7 +37,6 @@ export class IFrameInfoWebviewFactory {
         this.infoviewElement = infoviewElement;
     }
     make(editorApi, stylesheet, column) {
-        this.editorApi = editorApi;
         this.iframe = document.createElement("iframe");
         this.infoviewElement.append(this.iframe);
         this.iframe.contentWindow.document.open();
@@ -52,7 +49,7 @@ export class IFrameInfoWebviewFactory {
         // inside the webview through the standard message event.
         // The receiving of these messages is done inside webview\index.ts where it
         // calls window.addEventListener('message',...
-        this.rpc = new Rpc(m => {
+        const rpc = new Rpc(m => {
             try {
                 // JSON.stringify is needed here to serialize getters such as `Position.line` and `Position.character`
                 void this.iframe.contentWindow.postMessage(JSON.stringify(m));
@@ -61,20 +58,20 @@ export class IFrameInfoWebviewFactory {
                 // ignore any disposed object exceptions
             }
         });
-        this.rpc.register(editorApi);
+        rpc.register(editorApi);
         // Similarly, we can received data from the webview by listening to onDidReceiveMessage.
         document.defaultView.addEventListener('message', m => {
             if (m.source != this.iframe.contentWindow) {
                 return;
             }
             try {
-                this.rpc.messageReceived(JSON.parse(m.data));
+                rpc.messageReceived(JSON.parse(m.data));
             }
             catch {
                 // ignore any disposed object exceptions
             }
         });
-        return new IFrameInfoWebview(this.iframe, this.rpc);
+        return new IFrameInfoWebview(this.iframe, rpc);
     }
     updateCssVars() {
         const theme = this.themeService.getColorTheme();

package/dist/leanmonaco.d.ts

@@ -1,9 +1,9 @@
 import 'vscode/localExtensionHost';
 import { RegisterExtensionResult, WebSocketConfigOptionsUrl } from 'monaco-editor-wrapper';
-import { LeanClientProvider } from './vscode-lean4/vscode-lean4/src/utils/clientProvider';
-import { InfoProvider } from './vscode-lean4/vscode-lean4/src/infoview';
-import { AbbreviationFeature } from './vscode-lean4/vscode-lean4/src/abbreviation/AbbreviationFeature';
-import { LeanTaskGutter } from './vscode-lean4/vscode-lean4/src/taskgutter';
+import { LeanClientProvider } from 'lean4/src/utils/clientProvider';
+import { InfoProvider } from 'lean4/src/infoview';
+import { AbbreviationFeature } from 'lean4/src/abbreviation/AbbreviationFeature';
+import { LeanTaskGutter } from 'lean4/src/taskgutter';
 import { IFrameInfoWebviewFactory } from './infowebview';
 import { IExtensionManifest } from 'vscode/extensions';
 import { DisposableStore } from 'vscode/monaco';

package/dist/leanmonaco.js

@@ -1,9 +1,9 @@
 import 'vscode/localExtensionHost';
-import { LeanClientProvider } from './vscode-lean4/vscode-lean4/src/utils/clientProvider';
+import { LeanClientProvider } from 'lean4/src/utils/clientProvider';
 import { Uri, workspace } from 'vscode';
-import { InfoProvider } from './vscode-lean4/vscode-lean4/src/infoview';
-import { AbbreviationFeature } from './vscode-lean4/vscode-lean4/src/abbreviation/AbbreviationFeature';
-import { LeanTaskGutter } from './vscode-lean4/vscode-lean4/src/taskgutter';
+import { InfoProvider } from 'lean4/src/infoview';
+import { AbbreviationFeature } from 'lean4/src/abbreviation/AbbreviationFeature';
+import { LeanTaskGutter } from 'lean4/src/taskgutter';
 import { IFrameInfoWebviewFactory } from './infowebview';
 import { setupMonacoClient } from './monacoleanclient';
 import { checkLean4ProjectPreconditions } from './preconditions';
@@ -15,7 +15,7 @@ import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-serv
 import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
 import { registerExtension } from 'vscode/extensions';
 import { DisposableStore } from 'vscode/monaco';
-import packageJson from './vscode-lean4/vscode-lean4/package.json';
+import packageJson from 'lean4/package.json';
 export class LeanMonaco {
     ready;
     whenReady = new Promise((resolve) => {
@@ -107,7 +107,8 @@ export class LeanMonaco {
             testLeanVersion: () => { return "lean4/stable"; },
             getElanDefaultToolchain: () => { return "lean4/stable"; }
         }, { appendLine: () => { }
-        }, checkLean4ProjectPreconditions, setupMonacoClient(this.getWebSocketOptions(options)));
+        }, checkLean4ProjectPreconditions, setupMonacoClient(this.getWebSocketOptions(options)) // TODO: `as any` hack
+        );
         const asAbsolutePath = (path) => {
             switch (path) {
                 // url.pathToFileURL

package/dist/monacoleanclient.d.ts

@@ -1,4 +1,4 @@
 import { WorkerConfigDirect, WebSocketConfigOptions, WebSocketConfigOptionsUrl, WorkerConfigOptions } from 'monaco-editor-wrapper';
-import { ExtUri } from './vscode-lean4/vscode-lean4/src/utils/exturi';
+import { ExtUri } from 'lean4/src/utils/exturi';
 import { LanguageClientOptions } from 'vscode-languageclient/node';
 export declare const setupMonacoClient: (options: WebSocketConfigOptions | WebSocketConfigOptionsUrl | WorkerConfigOptions | WorkerConfigDirect) => (clientOptions: LanguageClientOptions, folderUri: ExtUri, elanDefaultToolchain: string) => Promise<import("monaco-languageclient").MonacoLanguageClient>;

package/dist/monacoleanclient.js

@@ -1,5 +1,5 @@
 import { LanguageClientWrapper } from 'monaco-editor-wrapper';
-import { displayError } from './vscode-lean4/vscode-lean4/src/utils/notifs';
+import { displayError } from 'lean4/src/utils/notifs';
 export const setupMonacoClient = (options) => {
     return async (clientOptions, folderUri, elanDefaultToolchain) => {
         const languageClientWrapper = new LanguageClientWrapper();

package/dist/preconditions.d.ts

@@ -1,4 +1,4 @@
 import { OutputChannel } from "vscode";
-import { ExtUri } from "./vscode-lean4/vscode-lean4/src/utils/exturi";
-import { PreconditionCheckResult } from "./vscode-lean4/vscode-lean4/src/diagnostics/setupNotifs";
+import { ExtUri } from "lean4/src/utils/exturi";
+import { PreconditionCheckResult } from "lean4/src/diagnostics/setupNotifs";
 export declare function checkLean4ProjectPreconditions(channel: OutputChannel, folderUri: ExtUri): Promise<PreconditionCheckResult>;

package/dist/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../src/index.ts"],"errors":true,"version":"5.8.2"}

package/dist/vscode-lean4/lean4-infoview/node_modules/@vscode/codicons/_iconCloud/keywords.transforms.json

@@ -0,0 +1,83 @@
+[
+  {
+    "method": "LoadTable",
+    "params": {
+      "relativePath": "_DataFilePath_",
+      "rootPath": "_RootPath_"
+    },
+    "variable": "iconKeywordsInputTable"
+  },
+  {
+    "transforms": [
+      {
+        "method": "Copy",
+        "params": {
+          "from": "_LibraryKey_"
+        },
+        "variable": "_IconData_LibraryKey_"
+      },
+      {
+        "method": "Copy",
+        "params": {
+          "from": "_IconTypeKey_"
+        },
+        "variable": "_IconData_TypeKey_"
+      },
+      {
+        "method": "GetColumnValue",
+        "params": {
+          "columnName": "iconColumnIconKeyValueName",
+          "iterator": "iconKeywordsTableIterator"
+        },
+        "variable": "iconKeyValue"
+      },
+      {
+        "method": "GetHashKey",
+        "notes": "The icon Key is derived from the uppercase unicode value.",
+        "params": {
+          "from": "iconKeyValue"
+        },
+        "variable": "_IconData_Key_"
+      },
+      {
+        "method": "UpdateVariablesTable",
+        "params": {
+          "variables": "_IconDataVariables_"
+        },
+        "variable": "_IconData_"
+      },
+      {
+        "method": "Clear",
+        "variable": "iconArtifacts"
+      },
+      {
+        "method": "GetColumnValue",
+        "params": {
+          "columnName": "iconColumnKeywordsName",
+          "iterator": "iconKeywordsTableIterator"
+        },
+        "variable": "iconKeywords"
+      },
+      {
+        "method": "AddToVariableBag",
+        "params": {
+          "value": "iconKeywords"
+        },
+        "variable": "iconArtifacts"
+      },
+      {
+        "method": "AddNameValuePairsToAssociationTable",
+        "params": {
+          "key": "_IconData_Key_",
+          "values": "iconArtifacts",
+          "keyColumn": "_IconArtifactData_IconKey_",
+          "namesColumn": "_IconArtifactData_Name_",
+          "valuesColumn": "_IconArtifactData_Value_"
+        },
+        "variable": "_IconArtifactData_"
+      }
+    ],
+    "method": "ForEachRow",
+    "variable": "iconKeywordsTableIterator"
+  }
+]

package/dist/vscode-lean4/lean4-infoview/node_modules/@vscode/codicons/_iconCloud/keywords.variables.json

@@ -0,0 +1,47 @@
+[
+  {
+    "tableSpecifier": {
+      "dataColumnIndex": 0,
+      "dataRowIndex": 1,
+      "headerRowIndex": 0
+    },
+    "type": "Table",
+    "valueType": "None",
+    "name": "iconKeywordsInputTable"
+  },
+  {
+    "type": "Value",
+    "value": "IconKeyValue",
+    "valueType": "Text",
+    "referenceOnly": true,
+    "name": "iconColumnIconKeyValueName"
+  },
+  {
+    "type": "Value",
+    "value": "Keywords",
+    "valueType": "Text",
+    "referenceOnly": true,
+    "name": "iconColumnKeywordsName"
+  },
+  {
+    "type": "TableIterator",
+    "TargetName": "iconKeywordsInputTable",
+    "name": "iconKeywordsTableIterator"
+  },
+  {
+    "type": "Value",
+    "valueType": "Text",
+    "name": "iconKeyValue"
+  },
+  {
+    "type": "Value",
+    "valueType": "Text",
+    "name": "iconKeywords"
+  },
+  {
+    "type": "VariableBag",
+    "valueType": "None",
+    "values": [],
+    "name": "iconArtifacts"
+  }
+]

package/dist/vscode-lean4/lean4-infoview/node_modules/@vscode/codicons/_iconCloud/manifest.json

@@ -0,0 +1,36 @@
+{
+  "_type": "Library",
+  "_version": "XCHRDK",
+  "dataPaths": [
+    {
+      "dataPath": "~/dist/codicon.csv",
+      "transformPaths": ["~/_iconCloud/manifest.transforms.json"],
+      "variablePaths": ["~/_iconCloud/manifest.variables.json"]
+    },
+    {
+      "dataPath": "~/_iconCloud/keywords.csv",
+      "transformPaths": ["~/_iconCloud/keywords.transforms.json"],
+      "variablePaths": ["~/_iconCloud/keywords.variables.json"]
+    }
+  ],
+  "iconType": "Glyph",
+  "lastUpdated": "2020-10-23T12:00Z",
+  "libraryInfoKey": "8df73c1d1",
+  "libraryName": "VS Code Icons",
+  "libraryProperties":
+  {
+    "copyPreviewTypes": "Glyph",
+    "copySize": "32",
+    "copyTypes": "Glyph,Svg",
+    "downloadDefaultSize": "32",
+    "downloadTypes": "Svg",
+    "libraryFileNameBase": "VsCodeIcons",
+    "libraryIconSizes": "16,24,32,40,48,56,64",
+    "metadata-1-dataMapping": "Icon:iconKeywords",
+    "metadata-1-dataStyle": "ClickablePill",
+    "metadata-1-dataType": "Keywords",
+    "metadata-1-label": "Keywords",
+    "metadata-1-sorting": "ByWeight"
+  },
+  "libraryVersion": "2.43"
+}