@codingame/monaco-vscode-api 2.0.1 → 2.0.3-improve-modularity.1

package/README.md

@@ -37,38 +37,15 @@ While it works great in `build` mode (because rollup is used), there is some iss
 
 There are workarounds for both:
 
-- We can help vite by replacing `import.meta.url` by the original module path (you need the `--experimental-import-meta-resolve` note option):
+- We can help vite by replacing `import.meta.url` by the original module path:
 ```typescript
+import importMetaUrlPlugin from '@codingame/esbuild-import-meta-url-plugin'
+
 {
   ...
   optimizeDeps: {
     esbuildOptions: {
-      plugins: [{
-        name: 'import.meta.url',
-        setup ({ onLoad }) {
-          // Help vite that bundles/move files in dev mode without touching `import.meta.url` which breaks asset urls
-          onLoad({ filter: /.*\.js/, namespace: 'file' }, async args => {
-            const code = fs.readFileSync(args.path, 'utf8')
-
-            const assetImportMetaUrlRE = /\bnew\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*(?:,\s*)?\)/g
-            let i = 0
-            let newCode = ''
-            for (let match = assetImportMetaUrlRE.exec(code); match != null; match = assetImportMetaUrlRE.exec(code)) {
-              newCode += code.slice(i, match.index)
-
-              const path = match[1].slice(1, -1)
-              const resolved = await import.meta.resolve!(path, url.pathToFileURL(args.path))
-
-              newCode += `new URL(${JSON.stringify(url.fileURLToPath(resolved))}, import.meta.url)`
-
-              i = assetImportMetaUrlRE.lastIndex
-            }
-            newCode += code.slice(i)
-
-            return { contents: newCode }
-          })
-        }
-      }]
+      plugins: [importMetaUrlPlugin]
     }
   }
 }
@@ -274,7 +251,7 @@ import * as monaco from 'monaco-editor'
 
 const modelRef = await monaco.editor.createModelReference(...)
 
-const editor = monaco.editor.createModel({ model: modelRef.object.textEditorModel })
+const editor = monaco.editor.create({ model: modelRef.object.textEditorModel })
 
 ...
 

package/api.js

@@ -29,7 +29,7 @@ function createProxy(key) {
     });
 }
 const api = {
-    version: "1.85.0",
+    version: "1.85.2",
     tasks: createProxy('tasks'),
     notebooks: createProxy('notebooks'),
     scm: createProxy('scm'),

package/missing-services.js

@@ -512,8 +512,8 @@ registerSingleton(IPathService, BrowserPathService, 1 );
 registerSingleton(IProductService, class ProductService {
     constructor() {
         this._serviceBrand = undefined;
-        this.version = "1.85.0";
-        this.commit = "af28b32d7e553898b2a91af498b1fb666fdebe0c";
+        this.version = "1.85.2";
+        this.commit = "1.85.2";
         this.quality = 'oss';
         this.nameShort = 'Code - OSS Dev';
         this.nameLong = 'Code - OSS Dev';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "2.0.1",
+  "version": "2.0.3-improve-modularity.1",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -96,12 +96,12 @@
   "dependencies": {
     "vscode-marked": "npm:marked@=3.0.2",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-extensions-service-override": "2.0.1",
-    "@codingame/monaco-vscode-files-service-override": "2.0.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.0.1",
-    "@codingame/monaco-vscode-environment-service-override": "2.0.1",
-    "@codingame/monaco-vscode-layout-service-override": "2.0.1",
-    "@codingame/monaco-vscode-host-service-override": "2.0.1",
-    "@codingame/monaco-vscode-base-service-override": "2.0.1"
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.0.3-improve-modularity.1",
+    "@codingame/monaco-vscode-files-service-override": "2.0.3-improve-modularity.1",
+    "@codingame/monaco-vscode-extensions-service-override": "2.0.3-improve-modularity.1",
+    "@codingame/monaco-vscode-environment-service-override": "2.0.3-improve-modularity.1",
+    "@codingame/monaco-vscode-layout-service-override": "2.0.3-improve-modularity.1",
+    "@codingame/monaco-vscode-host-service-override": "2.0.3-improve-modularity.1",
+    "@codingame/monaco-vscode-base-service-override": "2.0.3-improve-modularity.1"
   }
 }

package/services.js

@@ -142,9 +142,9 @@ async function initialize(overrides, container = document.body, configuration =
     initialize$1(container, configuration);
     const instantiationService = StandaloneServices.initialize({
         [( IProductService.toString())]: mixin({
-            version: "1.85.0",
+            version: "1.85.2",
             quality: 'oss',
-            commit: "af28b32d7e553898b2a91af498b1fb666fdebe0c",
+            commit: "1.85.2",
             nameShort: 'Code - OSS Dev',
             nameLong: 'Code - OSS Dev',
             applicationName: 'code-oss',

package/vscode/src/vs/base/browser/ui/contextview/contextview.js

@@ -57,7 +57,7 @@ class ContextView extends Disposable {
         this.useFixedPosition = domPosition !== 1 ;
         const usedShadowDOM = this.useShadowDOM;
         this.useShadowDOM = domPosition === 3 ;
-        if (container === this.container && usedShadowDOM !== this.useShadowDOM) {
+        if (container === this.container && usedShadowDOM === this.useShadowDOM) {
             return;
         }
         if (this.container) {

package/vscode/src/vs/editor/browser/config/elementSizeObserver.js

@@ -24,10 +24,10 @@ class ElementSizeObserver extends Disposable {
     }
     startObserving() {
         if (!this._resizeObserver && this._referenceDomElement) {
-            let observeContentRect = null;
+            let observedDimenstion = null;
             const observeNow = () => {
-                if (observeContentRect) {
-                    this.observe({ width: observeContentRect.width, height: observeContentRect.height });
+                if (observedDimenstion) {
+                    this.observe({ width: observedDimenstion.width, height: observedDimenstion.height });
                 }
                 else {
                     this.observe();
@@ -51,7 +51,12 @@ class ElementSizeObserver extends Disposable {
                 }
             };
             this._resizeObserver = ( new ResizeObserver((entries) => {
-                observeContentRect = (entries && entries[0] && entries[0].contentRect ? entries[0].contentRect : null);
+                if (entries && entries[0] && entries[0].contentRect) {
+                    observedDimenstion = { width: entries[0].contentRect.width, height: entries[0].contentRect.height };
+                }
+                else {
+                    observedDimenstion = null;
+                }
                 shouldObserve = true;
                 update();
             }));

package/vscode/src/vs/workbench/browser/parts/editor/editor.autosave.contribution.js

@@ -0,0 +1,4 @@
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorAutoSave } from './editorAutoSave.js';
+import { Extensions } from '../../../common/contributions.js';
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(EditorAutoSave, 2 );

package/vscode/src/vs/workbench/browser/style.js

@@ -1,44 +1,3 @@
-import { registerThemingParticipant } from '../../platform/theme/common/themeService.js';
-import { TITLE_BAR_ACTIVE_BACKGROUND, WORKBENCH_BACKGROUND } from '../common/theme.js';
-import { isWeb, isIOS, isWindows, isMacintosh } from '../../base/common/platform.js';
-import { createMetaElement } from '../../base/browser/dom.js';
-import { isSafari, isStandalone } from '../../base/browser/browser.js';
-import { selectionBackground } from '../../platform/theme/common/colorRegistry.js';
-import { mainWindow } from '../../base/browser/window.js';
-registerThemingParticipant((theme, collector) => {
-    const workbenchBackground = WORKBENCH_BACKGROUND(theme);
-    collector.addRule(`.monaco-workbench { background-color: ${workbenchBackground}; }`);
-    const windowSelectionBackground = theme.getColor(selectionBackground);
-    if (windowSelectionBackground) {
-        collector.addRule(`.monaco-workbench ::selection { background-color: ${windowSelectionBackground}; }`);
-    }
-    if (isWeb) {
-        const titleBackground = theme.getColor(TITLE_BAR_ACTIVE_BACKGROUND);
-        if (titleBackground) {
-            const metaElementId = 'monaco-workbench-meta-theme-color';
-            let metaElement = mainWindow.document.getElementById(metaElementId);
-            if (!metaElement) {
-                metaElement = createMetaElement();
-                metaElement.name = 'theme-color';
-                metaElement.id = metaElementId;
-            }
-            metaElement.content = ( titleBackground.toString());
-        }
-    }
-    if (isSafari) {
-        collector.addRule(`
-			body.web {
-				touch-action: none;
-			}
-			.monaco-workbench .monaco-editor .view-lines {
-				user-select: text;
-				-webkit-user-select: text;
-			}
-		`);
-    }
-    if (isIOS && isStandalone()) {
-        collector.addRule(`body { background-color: ${workbenchBackground}; }`);
-    }
-});
+import { isWindows, isMacintosh } from '../../base/common/platform.js';
 const DEFAULT_FONT_FAMILY = isWindows ? '"Segoe WPC", "Segoe UI", sans-serif' : isMacintosh ? '-apple-system, BlinkMacSystemFont, sans-serif' : 'system-ui, "Ubuntu", "Droid Sans", sans-serif';
 export { DEFAULT_FONT_FAMILY };

package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js

@@ -1205,6 +1205,10 @@ const pasteFileHandler = async (accessor, fileList) => {
     }
     const element = context.length ? context[0] : explorerService.roots[0];
     const incrementalNaming = configurationService.getValue().explorer.incrementalNaming;
+    const editableItem = explorerService.getEditable();
+    if (editableItem) {
+        return;
+    }
     try {
         const sourceTargetPairs = coalesce(await Promise.all(( toPaste.map(async (fileToPaste) => {
             if (( element.resource.toString()) !== ( fileToPaste.toString()) && isEqualOrParent(element.resource, fileToPaste)) {