From bf5774af81fca8cc9c1e9df07e9d1c525afc7c59 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 4 Jul 2016 16:52:48 +0200 Subject: [PATCH] VS Code allows to open *.asar file from the command line (fixes #8723) --- src/typings/electron.d.ts | 6 ++++++ src/vs/code/electron-main/env.ts | 2 +- src/vs/code/electron-main/main.ts | 2 +- src/vs/code/electron-main/storage.ts | 2 +- src/vs/code/electron-main/update-manager.ts | 2 +- src/vs/code/electron-main/windows.ts | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/typings/electron.d.ts b/src/typings/electron.d.ts index abd89ba6348..fe325a2047c 100644 --- a/src/typings/electron.d.ts +++ b/src/typings/electron.d.ts @@ -1887,6 +1887,12 @@ declare module 'electron' { export = electron; } +declare module 'original-fs' { + import * as fs from 'fs'; + + export = fs; +} + // interface NodeRequireFunction { // (moduleName: 'electron'): Electron.Electron; // } \ No newline at end of file diff --git a/src/vs/code/electron-main/env.ts b/src/vs/code/electron-main/env.ts index 36db9b4e7c7..30a4498e7a7 100644 --- a/src/vs/code/electron-main/env.ts +++ b/src/vs/code/electron-main/env.ts @@ -6,7 +6,7 @@ 'use strict'; import * as crypto from 'crypto'; -import * as fs from 'fs'; +import * as fs from 'original-fs'; import * as path from 'path'; import * as os from 'os'; import { app } from 'electron'; diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index 6cb72691b98..9f4fcab157c 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -6,7 +6,7 @@ 'use strict'; import * as nls from 'vs/nls'; -import * as fs from 'fs'; +import * as fs from 'original-fs'; import { app, ipcMain as ipc } from 'electron'; import { assign } from 'vs/base/common/objects'; import { mkdirp } from 'vs/base/node/pfs'; diff --git a/src/vs/code/electron-main/storage.ts b/src/vs/code/electron-main/storage.ts index f0b7316667b..8868f63d326 100644 --- a/src/vs/code/electron-main/storage.ts +++ b/src/vs/code/electron-main/storage.ts @@ -6,7 +6,7 @@ 'use strict'; import * as path from 'path'; -import * as fs from 'fs'; +import * as fs from 'original-fs'; import { EventEmitter } from 'events'; import { IEnvironmentService } from 'vs/code/electron-main/env'; import { ServiceIdentifier, createDecorator } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/code/electron-main/update-manager.ts b/src/vs/code/electron-main/update-manager.ts index fa24a838511..e0b416b1214 100644 --- a/src/vs/code/electron-main/update-manager.ts +++ b/src/vs/code/electron-main/update-manager.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as fs from 'fs'; +import * as fs from 'original-fs'; import * as path from 'path'; import * as electron from 'electron'; import * as platform from 'vs/base/common/platform'; diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts index 9f11a3a76ed..e8fe3bdc2ce 100644 --- a/src/vs/code/electron-main/windows.ts +++ b/src/vs/code/electron-main/windows.ts @@ -6,7 +6,7 @@ 'use strict'; import * as path from 'path'; -import * as fs from 'fs'; +import * as fs from 'original-fs'; import * as platform from 'vs/base/common/platform'; import * as nls from 'vs/nls'; import * as paths from 'vs/base/common/paths'; -- GitLab