maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

more renames

Browse source
This commit is contained in:
Benjamin Pasero 2017-06-08 12:33:04 +02:00
parent c2cb4fc173
commit 0526234210
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/code/electron-main/app.ts
View file

@ -12,7 +12,7 @@ import { IWindowsService, OpenContext } from 'vs/platform/windows/common/windows
import { WindowsChannel } from 'vs/platform/windows/common/windowsIpc';
import { WindowsService } from 'vs/platform/windows/electron-main/windowsService';
import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
import { VSCodeMenu } from 'vs/code/electron-main/menus';
import { CodeMenu } from 'vs/code/electron-main/menus';
import { getShellEnvironment } from 'vs/code/node/shellEnv';
import { IUpdateService } from 'vs/platform/update/common/update';
import { UpdateChannel } from 'vs/platform/update/common/updateIpc';
@ -45,7 +45,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { ConfigurationService } from 'vs/platform/configuration/node/configurationService';
import { TPromise } from "vs/base/common/winjs.base";
export class VSCodeApplication {
export class CodeApplication {
private toDispose: IDisposable[];
private windowsMainService: IWindowsMainService;
@ -254,7 +254,7 @@ export class VSCodeApplication {
}
// Install Menu
appInstantiationService.createInstance(VSCodeMenu);
appInstantiationService.createInstance(CodeMenu);
// Jump List
this.windowsMainService.updateWindowsJumpList();

4
src/vs/code/electron-main/main.ts
View file

@ -32,7 +32,7 @@ import { RequestService } from 'vs/platform/request/electron-main/requestService
import { IURLService } from 'vs/platform/url/common/url';
import { URLService } from 'vs/platform/url/electron-main/urlService';
import * as fs from 'original-fs';
import { VSCodeApplication } from "vs/code/electron-main/app";
import { CodeApplication } from "vs/code/electron-main/app";
function createServices(args: ParsedArgs): IInstantiationService {
const services = new ServiceCollection();
@ -193,7 +193,7 @@ function main() {
return instantiationService.invokeFunction(a => createPaths(a.get(IEnvironmentService)))
.then(() => instantiationService.invokeFunction(setupIPC))
.then(mainIpcServer => {
const app = instantiationService.createInstance(VSCodeApplication, mainIpcServer, instanceEnv);
const app = instantiationService.createInstance(CodeApplication, mainIpcServer, instanceEnv);
app.startup();
});
}).done(null, err => instantiationService.invokeFunction(quit, err));

6
src/vs/code/electron-main/menus.ts
View file

@ -152,7 +152,7 @@ class KeybindingsResolver {
const telemetryFrom = 'menu';
export class VSCodeMenu {
export class CodeMenu {
private static MAX_MENU_RECENT_ENTRIES = 10;
@ -523,7 +523,7 @@ export class VSCodeMenu {
if (folders.length > 0) {
openRecentMenu.append(__separator__());
for (let i = 0; i < VSCodeMenu.MAX_MENU_RECENT_ENTRIES && i < folders.length; i++) {
for (let i = 0; i < CodeMenu.MAX_MENU_RECENT_ENTRIES && i < folders.length; i++) {
openRecentMenu.append(this.createOpenRecentMenuItem(folders[i], 'openRecentFolder'));
}
}
@ -532,7 +532,7 @@ export class VSCodeMenu {
if (files.length > 0) {
openRecentMenu.append(__separator__());
for (let i = 0; i < VSCodeMenu.MAX_MENU_RECENT_ENTRIES && i < files.length; i++) {
for (let i = 0; i < CodeMenu.MAX_MENU_RECENT_ENTRIES && i < files.length; i++) {
openRecentMenu.append(this.createOpenRecentMenuItem(files[i], 'openRecentFile'));
}
}

8
src/vs/code/electron-main/window.ts
View file

@ -57,10 +57,10 @@ export const defaultWindowState = function (mode = WindowMode.Normal): IWindowSt
export interface IPath {
// the workspace spath for a VSCode instance which can be null
// the workspace spath for a Code instance which can be null
workspacePath?: string;
// the file path to open within a VSCode instance
// the file path to open within a Code instance
filePath?: string;
// the line number in the file path to open
@ -69,7 +69,7 @@ export interface IPath {
// the column number in the file path to open
columnNumber?: number;
// indicator to create the file path in the VSCode instance
// indicator to create the file path in the Code instance
createFilePath?: boolean;
}
@ -376,7 +376,7 @@ export class CodeWindow implements ICodeWindow {
this.pendingLoadConfig = null;
}
// To prevent flashing, we set the window visible after the page has finished to load but before VSCode is loaded
// To prevent flashing, we set the window visible after the page has finished to load but before Code is loaded
if (!this._win.isVisible()) {
if (this.windowState.mode === WindowMode.Maximized) {
this._win.maximize();