@codingame/monaco-vscode-files-service-override 2.2.0-next.3 → 2.2.0-next.5

package/files.js

@@ -11,8 +11,6 @@ import { Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base
 import { extUri, joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 export { HTMLFileSystemProvider } from 'vscode/vscode/vs/platform/files/browser/htmlFileSystemProvider';
-import { relative } from 'vscode/vscode/vs/base/common/path';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/files.configuration.contribution';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IndexedDBFileSystemProvider } from './vscode/src/vs/platform/files/browser/indexedDBFileSystemProvider.js';
 import { IndexedDB } from 'vscode/vscode/vs/base/browser/indexedDB';
@@ -27,6 +25,7 @@ import { BrowserElevatedFileService } from './vscode/src/vs/workbench/services/f
 import { IElevatedFileService } from 'vscode/vscode/vs/workbench/services/files/common/elevatedFileService';
 import { registerServiceInitializePreParticipant, checkServicesNotInitialized } from 'vscode/lifecycle';
 import { logsPath } from 'vscode/workbench';
+import 'vscode/vscode/vs/workbench/contrib/files/browser/files.configuration.contribution';
 
 class RegisteredFile {
     constructor(uri, readonly) {
@@ -133,12 +132,11 @@ class RegisteredFileSystemProvider extends Disposable {
         disposableStore.add(file.onDidRename(({ from, to }) => {
             if (this.files.get(( from.toString())) === file) {
                 this.files.delete(( from.toString()));
+                this.files.set(( to.toString()), file);
                 this._onDidChangeFile.fire([{
                         resource: from,
                         type: 2
-                    }]);
-                this.files.set(( to.toString()), file);
-                this._onDidChangeFile.fire([{
+                    }, {
                         resource: to,
                         type: 1
                     }]);
@@ -167,7 +165,7 @@ class RegisteredFileSystemProvider extends Disposable {
     }
     async readdir(resource) {
         const includedPaths = ( Array.from(( this.files.keys()))
-            .map(uri => relative(resource.path, ( URI.parse(uri)).path)))
+            .map(uri => extUri.relativePath(resource, ( URI.parse(uri)))))
             .filter(path => !path.startsWith('..'));
         const files = includedPaths.filter(path => !path.includes('/'));
         const directories = ( includedPaths.filter(path => path.includes('/')).map(path => path.slice(0, path.indexOf('/'))));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-files-service-override",
-  "version": "2.2.0-next.3",
+  "version": "2.2.0-next.5",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0-next.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0-next.5",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }