use workspace settings

hhu-adam · Jul 29, 2024 · 818b620 · 818b620
1 parent c73d58b
commit 818b620
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/cypress/e2e/spec.cy.ts b/cypress/e2e/spec.cy.ts
@@ -20,24 +20,19 @@ describe('Editor Test', () => {
       .should(($p) => {
         expect(getComputedStyle($p.get(0)).getPropertyValue('--vscode-editor-background')).to.equal("#ffffff")
       })
-    cy.wait(4000)
     cy.get('[data-cy="theme-dark"]').click()
-    cy.wait(4000)
     cy.contains('#check Nat')
       .should(($p) => {
         expect(getComputedStyle($p.get(0)).getPropertyValue('--vscode-editor-background')).to.equal("#1e1e1e")
       })
   })
   it('inputs unicode', () => {
-
     cy.visit('http://localhost:5173/')
     cy.get('[data-cy="leader-backslash"]').click()
     cy.contains('#check Nat').click("left")
     cy.get('body').type('\\alpha')
     cy.contains('α')
-    cy.wait(4000)
     cy.get('[data-cy="leader-comma"]').click()
-    cy.wait(4000)
     cy.contains('#check Nat').click("left")
     cy.get('body').type(',beta')
     cy.contains('β')

diff --git a/demo/src/App.tsx b/demo/src/App.tsx
@@ -4,16 +4,16 @@ import LeanMonacoComponent from './LeanMonaco'
 import { LeanMonacoOptions } from 'lean4monaco'
 
 function App() {
-  const [options, setOptions] = useState<LeanMonacoOptions>({websocket: {url: 'ws://localhost:8080/'}, vscode: {"editor.theme": "Visual Studio Light"}})
+  const [options, setOptions] = useState<LeanMonacoOptions>({websocket: {url: 'ws://localhost:8080/'}, vscode: {"workbench.colorTheme": "Visual Studio Light"}})
 
   return (
     <>
       <button
-        onClick={() => {setOptions({...options, vscode: {...options.vscode, "editor.theme": "Visual Studio Light"}})}}
+        onClick={() => {setOptions({...options, vscode: {...options.vscode, "workbench.colorTheme": "Visual Studio Light"}})}}
         data-cy="theme-light"
       >Light</button>
       <button
-        onClick={() => {setOptions({...options, vscode: {...options.vscode, "editor.theme": "Visual Studio Dark"}})}}
+        onClick={() => {setOptions({...options, vscode: {...options.vscode, "workbench.colorTheme": "Visual Studio Dark"}})}}
         data-cy="theme-dark"
       >Dark</button>
       <button

diff --git a/demo/src/LeanMonaco.tsx b/demo/src/LeanMonaco.tsx
@@ -12,7 +12,7 @@ function LeanMonacoComponent({options} : {options: LeanMonacoOptions}) {
     ;(async () => {
         await leanMonaco.start(options)
         leanMonaco.setInfoviewElement(infoviewRef.current!)
-        await leanMonacoEditor.start(codeviewRef.current!, `/project/test${Math.random()}.lean`, '#check Nat', options.vscode!["editor.theme"]!)
+        await leanMonacoEditor.start(codeviewRef.current!, `/project/test${Math.random()}.lean`, '#check Nat')
     })()
 
     return () => {

diff --git a/dev/main.ts b/dev/main.ts
@@ -10,7 +10,7 @@ leanMonaco.setInfoviewElement(document.getElementById('infoview')!)
 leanMonaco.dispose()
 
 leanMonaco = new LeanMonaco()
-leanMonaco.start({websocket: {url: 'ws://localhost:8080/'}, vscode: {"editor.theme": "Cobalt"}})
+leanMonaco.start({websocket: {url: 'ws://localhost:8080/'}, vscode: {"workbench.colorTheme": "Cobalt"}})
 leanMonaco.setInfoviewElement(document.getElementById('infoview')!)
 
 await leanMonaco.whenReady

diff --git a/src/leanmonaco.ts b/src/leanmonaco.ts
@@ -1,7 +1,7 @@
 import 'vscode/localExtensionHost'
 import { RegisterExtensionResult, WebSocketConfigOptionsUrl } from 'monaco-editor-wrapper';
 import { LeanClientProvider } from './vscode-lean4/vscode-lean4/src/utils/clientProvider';
-import { Uri } from 'vscode';
+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';
@@ -116,6 +116,8 @@ export class LeanMonaco {
 
     if (this.disposed) return;
 
+    this.updateVSCodeOptions(options.vscode ?? {})
+
     this.abbreviationFeature = new AbbreviationFeature({} as any, { kind: 'MoveAllSelections' });
 
     this.clientProvider = new LeanClientProvider(
@@ -151,9 +153,9 @@ export class LeanMonaco {
   }
 
   updateVSCodeOptions(vsCodeOptions: { [id: string]: any }){
-    updateUserConfiguration(JSON.stringify({
-      "[lean4]": vsCodeOptions
-    }))
+    for (const key in vsCodeOptions) {
+        workspace.getConfiguration().update(key, vsCodeOptions[key])
+    }
   }
 
   setInfoviewElement(infoviewEl: HTMLElement){
@@ -222,7 +224,6 @@ export class LeanMonaco {
           }
         ],
         "configurationDefaults": {
-          "[lean4]": {
             "editor.folding": false,
             "editor.wordSeparators": "`~@$%^&*()-=+[{]}⟨⟩⦃⦄⟦⟧⟮⟯‹›\\|;:\",.<>/",
             "editor.lineNumbers": 'on',
@@ -239,9 +240,7 @@ export class LeanMonaco {
             "editor.acceptSuggestionOnEnter": "off",
             "editor.fontFamily": "JuliaMono",
             "editor.wrappingStrategy": "advanced",
-            "editor.theme": "Visual Studio Light", //"Cobalt" // "Visual Studio Light" //"Visual Studio Dark" //"Default Light Modern" //"Default Light+" //"Default Dark+" //"Default High Contrast"
-          }
-        },
+          },
         "themes": [
           {
               "id": "Cobalt",