Quick link for tools and languages (fixes #22098)
This commit is contained in:
Christof Marti
parent
fade7d4687
commit
b00945fc8c
|
|
@ -14,5 +14,10 @@
|
|||
"win32ShellNameShort": "C&ode - OSS",
|
||||
"darwinBundleIdentifier": "com.visualstudio.code.oss",
|
||||
"reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new",
|
||||
"extensionsGallery": {
|
||||
"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
|
||||
"cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
|
||||
"itemUrl": "https://marketplace.visualstudio.com/items"
|
||||
},
|
||||
"urlProtocol": "code-oss"
|
||||
}
|
||||
|
|
@ -1048,6 +1048,34 @@ export class ShowRecommendedKeymapExtensionsAction extends Action {
|
|||
}
|
||||
}
|
||||
|
||||
export class ShowExtensionPacksAction extends Action {
|
||||
|
||||
static ID = 'workbench.extensions.action.showExtensionPacks';
|
||||
static LABEL = localize('showExtensionPacks', "Show Extension Packs");
|
||||
static SHORT_LABEL = localize('showExtensionPacksShort', "Extension Packs");
|
||||
|
||||
constructor(
|
||||
id: string,
|
||||
label: string,
|
||||
@IViewletService private viewletService: IViewletService
|
||||
) {
|
||||
super(id, label, null, true);
|
||||
}
|
||||
|
||||
run(): TPromise<void> {
|
||||
return this.viewletService.openViewlet(VIEWLET_ID, true)
|
||||
.then(viewlet => viewlet as IExtensionsViewlet)
|
||||
.then(viewlet => {
|
||||
viewlet.search('@sort:installs @category:"extension packs" ');
|
||||
viewlet.focus();
|
||||
});
|
||||
}
|
||||
|
||||
protected isEnabled(): boolean {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
export class ChangeSortAction extends Action {
|
||||
|
||||
private query: Query;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ import { ExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/node/e
|
|||
import {
|
||||
OpenExtensionsViewletAction, InstallExtensionsAction, ShowOutdatedExtensionsAction, ShowRecommendedExtensionsAction, ShowRecommendedKeymapExtensionsAction, ShowWorkspaceRecommendedExtensionsAction, ShowPopularExtensionsAction,
|
||||
ShowInstalledExtensionsAction, ShowDisabledExtensionsAction, UpdateAllAction, ConfigureWorkspaceRecommendedExtensionsAction,
|
||||
EnableAllAction, EnableAllWorkpsaceAction, DisableAllAction, DisableAllWorkpsaceAction, CheckForUpdatesAction
|
||||
EnableAllAction, EnableAllWorkpsaceAction, DisableAllAction, DisableAllWorkpsaceAction, CheckForUpdatesAction, ShowExtensionPacksAction
|
||||
} from 'vs/workbench/parts/extensions/browser/extensionsActions';
|
||||
import { OpenExtensionsFolderAction, InstallVSIXAction } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
|
||||
import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
|
||||
|
|
@ -37,7 +37,7 @@ import jsonContributionRegistry = require('vs/platform/jsonschemas/common/jsonCo
|
|||
import { ExtensionsConfigurationSchema, ExtensionsConfigurationSchemaId } from 'vs/workbench/parts/extensions/common/extensionsFileTemplate';
|
||||
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
|
||||
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { KeymapExtensions } from 'vs/workbench/parts/extensions/electron-browser/keymapExtensions';
|
||||
import { KeymapExtensions } from 'vs/workbench/parts/extensions/electron-browser/extensionsUtils';
|
||||
import { adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
|
||||
|
||||
// Singletons
|
||||
|
|
@ -115,6 +115,9 @@ actionRegistry.registerWorkbenchAction(recommendationsActionDescriptor, 'Extensi
|
|||
const keymapRecommendationsActionDescriptor = new SyncActionDescriptor(ShowRecommendedKeymapExtensionsAction, ShowRecommendedKeymapExtensionsAction.ID, ShowRecommendedKeymapExtensionsAction.SHORT_LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_M) });
|
||||
actionRegistry.registerWorkbenchAction(keymapRecommendationsActionDescriptor, 'Preferences: Keymaps', PreferencesLabel);
|
||||
|
||||
const extensionPacksActionDescriptor = new SyncActionDescriptor(ShowExtensionPacksAction, ShowExtensionPacksAction.ID, ShowExtensionPacksAction.SHORT_LABEL);
|
||||
actionRegistry.registerWorkbenchAction(extensionPacksActionDescriptor, 'Extensions: Extension Packs', PreferencesLabel);
|
||||
|
||||
const workspaceRecommendationsActionDescriptor = new SyncActionDescriptor(ShowWorkspaceRecommendedExtensionsAction, ShowWorkspaceRecommendedExtensionsAction.ID, ShowWorkspaceRecommendedExtensionsAction.LABEL);
|
||||
actionRegistry.registerWorkbenchAction(workspaceRecommendationsActionDescriptor, 'Extensions: Show Workspace Recommended Extensions', ExtensionsLabel);
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
|
|||
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
|
||||
import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
|
||||
export interface IKeymapExtension {
|
||||
export interface IExtensionStatus {
|
||||
identifier: string;
|
||||
local: ILocalExtension;
|
||||
globallyEnabled: boolean;
|
||||
|
|
@ -32,13 +32,14 @@ export class KeymapExtensions implements IWorkbenchContribution {
|
|||
constructor(
|
||||
@IInstantiationService private instantiationService: IInstantiationService,
|
||||
@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
|
||||
@IExtensionTipsService private tipsService: IExtensionTipsService,
|
||||
@IChoiceService private choiceService: IChoiceService,
|
||||
@ILifecycleService lifecycleService: ILifecycleService,
|
||||
@ITelemetryService private telemetryService: ITelemetryService,
|
||||
) {
|
||||
this.disposables.push(
|
||||
lifecycleService.onShutdown(() => this.dispose()),
|
||||
instantiationService.invokeFunction(onKeymapExtensionChanged)((ids => {
|
||||
instantiationService.invokeFunction(onExtensionChanged)((ids => {
|
||||
TPromise.join(ids.map(id => this.checkForOtherKeymaps(id)))
|
||||
.then(null, onUnexpectedError);
|
||||
}))
|
||||
|
|
@ -50,10 +51,11 @@ export class KeymapExtensions implements IWorkbenchContribution {
|
|||
}
|
||||
|
||||
private checkForOtherKeymaps(extensionId: string): TPromise<void> {
|
||||
return this.instantiationService.invokeFunction(getInstalledKeymaps).then(extensions => {
|
||||
const extension = arrays.first(extensions, extension => extension.identifier === extensionId);
|
||||
return this.instantiationService.invokeFunction(getInstalledExtensions).then(extensions => {
|
||||
const keymaps = extensions.filter(extension => isKeymapExtension(this.tipsService, extension));
|
||||
const extension = arrays.first(keymaps, extension => extension.identifier === extensionId);
|
||||
if (extension && extension.globallyEnabled) {
|
||||
const otherKeymaps = extensions.filter(extension => extension.identifier !== extensionId && extension.globallyEnabled);
|
||||
const otherKeymaps = keymaps.filter(extension => extension.identifier !== extensionId && extension.globallyEnabled);
|
||||
if (otherKeymaps.length) {
|
||||
return this.promptForDisablingOtherKeymaps(extension, otherKeymaps);
|
||||
}
|
||||
|
|
@ -62,7 +64,7 @@ export class KeymapExtensions implements IWorkbenchContribution {
|
|||
});
|
||||
}
|
||||
|
||||
private promptForDisablingOtherKeymaps(newKeymap: IKeymapExtension, oldKeymaps: IKeymapExtension[]): TPromise<void> {
|
||||
private promptForDisablingOtherKeymaps(newKeymap: IExtensionStatus, oldKeymaps: IExtensionStatus[]): TPromise<void> {
|
||||
const telemetryData: { [key: string]: any; } = {
|
||||
newKeymap: newKeymap.identifier,
|
||||
oldKeymaps: oldKeymaps.map(k => k.identifier)
|
||||
|
|
@ -92,7 +94,7 @@ export class KeymapExtensions implements IWorkbenchContribution {
|
|||
}
|
||||
}
|
||||
|
||||
export function onKeymapExtensionChanged(accessor: ServicesAccessor): Event<string[]> {
|
||||
export function onExtensionChanged(accessor: ServicesAccessor): Event<string[]> {
|
||||
const extensionService = accessor.get(IExtensionManagementService);
|
||||
const extensionEnablementService = accessor.get(IExtensionEnablementService);
|
||||
return debounceEvent<string, string[]>(any(
|
||||
|
|
@ -110,13 +112,12 @@ export function onKeymapExtensionChanged(accessor: ServicesAccessor): Event<stri
|
|||
});
|
||||
}
|
||||
|
||||
export function getInstalledKeymaps(accessor: ServicesAccessor): TPromise<IKeymapExtension[]> {
|
||||
export function getInstalledExtensions(accessor: ServicesAccessor): TPromise<IExtensionStatus[]> {
|
||||
const extensionService = accessor.get(IExtensionManagementService);
|
||||
const extensionEnablementService = accessor.get(IExtensionEnablementService);
|
||||
const tipsService = accessor.get(IExtensionTipsService);
|
||||
return extensionService.getInstalled().then(extensions => {
|
||||
const globallyDisabled = extensionEnablementService.getGloballyDisabledExtensions();
|
||||
const installedExtensions = extensions.map(extension => {
|
||||
return extensions.map(extension => {
|
||||
const identifier = stripVersion(extension.id);
|
||||
return {
|
||||
identifier,
|
||||
|
|
@ -124,11 +125,10 @@ export function getInstalledKeymaps(accessor: ServicesAccessor): TPromise<IKeyma
|
|||
globallyEnabled: globallyDisabled.indexOf(identifier) === -1
|
||||
};
|
||||
});
|
||||
return installedExtensions.filter(extension => isKeymapExtension(tipsService, extension));
|
||||
});
|
||||
}
|
||||
|
||||
function isKeymapExtension(tipsService: IExtensionTipsService, extension: IKeymapExtension): boolean {
|
||||
export function isKeymapExtension(tipsService: IExtensionTipsService, extension: IExtensionStatus): boolean {
|
||||
const cats = extension.local.manifest.categories;
|
||||
return cats && cats.indexOf('Keymaps') !== -1 || tipsService.getKeymapRecommendations().indexOf(extension.identifier) !== -1;
|
||||
}
|
||||
|
|
@ -52,14 +52,15 @@ export default () => `
|
|||
<div class="section customize">
|
||||
<h2>${escape(localize('welcomePage.customize', "Customize"))}</h2>
|
||||
<ul>
|
||||
<li class="showRecommendedKeymapExtensions"><button data-href="command:workbench.extensions.action.showRecommendedKeymapExtensions"><h3>${escape(localize('welcomePage.installKeymapDescription', "Install keyboard shortcuts"))}</h3> <span>${escape(localize('welcomePage.installKeymap', "Install the keyboard shortcuts of {0}, {1}, {2} and {3}"))
|
||||
.replace('{0}', `<a class="installKeymap" data-keymap-name="${escape(localize('welcomePage.vim', "Vim"))}" data-keymap="vscodevim.vim" href="javascript:void(0)">${escape(localize('welcomePage.vim', "Vim"))}</a><span class="currentKeymap" data-keymap="vscodevim.vim">${escape(localize('welcomePage.vimCurrent', "Vim (current)"))}</span>`)
|
||||
.replace('{1}', `<a class="installKeymap" data-keymap-name="${escape(localize('welcomePage.sublime', "Sublime"))}" data-keymap="ms-vscode.sublime-keybindings" href="javascript:void(0)">${escape(localize('welcomePage.sublime', "Sublime"))}</a><span class="currentKeymap" data-keymap="ms-vscode.sublime-keybindings">${escape(localize('welcomePage.sublimeCurrent', "Sublime (current)"))}</span>`)
|
||||
.replace('{2}', `<a class="installKeymap" data-keymap-name="${escape(localize('welcomePage.atom', "Atom"))}" data-keymap="ms-vscode.atom-keybindings" href="javascript:void(0)">${escape(localize('welcomePage.atom', "Atom"))}</a><span class="currentKeymap" data-keymap="ms-vscode.atom-keybindings">${escape(localize('welcomePage.atomCurrent', "Atom (current)"))}</span>`)
|
||||
.replace('{3}', `<a href="command:workbench.extensions.action.showRecommendedKeymapExtensions">${escape(localize('welcomePage.others', "others"))}</a>`)}
|
||||
<li class="showExtensionPacks"><button data-href="command:workbench.extensions.action.showExtensionPacks"><h3>${escape(localize('welcomePage.installExtensionPacks', "Tools and languages"))}</h3> <span>${escape(localize('welcomePage.installExtensionPacksDescription', "Install support for {0} and {1}"))
|
||||
.replace('{0}', `<span class="extensionPackList"></span>`)
|
||||
.replace('{1}', `<a href="command:workbench.extensions.action.showExtensionPacks">${escape(localize('welcomePage.moreExtensions', "more"))}</a>`)}
|
||||
</span></button></li>
|
||||
<li class="showRecommendedKeymapExtensions"><button data-href="command:workbench.extensions.action.showRecommendedKeymapExtensions"><h3>${escape(localize('welcomePage.installKeymapDescription', "Install keyboard shortcuts"))}</h3> <span>${escape(localize('welcomePage.installKeymapExtension', "Install the keyboard shortcuts of {0} and {1}"))
|
||||
.replace('{0}', `<span class="keymapList"></span>`)
|
||||
.replace('{1}', `<a href="command:workbench.extensions.action.showRecommendedKeymapExtensions">${escape(localize('welcomePage.others', "others"))}</a>`)}
|
||||
</span></button></li>
|
||||
<li class="selectTheme"><button data-href="command:workbench.action.selectTheme"><h3>${escape(localize('welcomePage.colorTheme', "Color theme"))}</h3> <span>${escape(localize('welcomePage.colorThemeDescription', "Make the editor and your code look the way you love"))}</span></button></li>
|
||||
<li class="openGlobalSettings"><button data-href="command:workbench.action.openGlobalSettings"><h3>${escape(localize('welcomePage.configureSettings', "Configure settings"))}</h3> <span>${escape(localize('welcomePage.configureSettingsDescription', "Unlock the full power of VS Code by tweaking the settings"))}</span></button></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section learn">
|
||||
|
|
@ -74,6 +75,7 @@ export default () => `
|
|||
<h2>${escape(localize('welcomePage.quickLinks', "Quick links"))}</h2>
|
||||
<ul>
|
||||
<li class="keybindingsReference"><button data-href="command:workbench.action.keybindingsReference"><h3>${escape(localize('welcomePage.keybindingsReference', "Keyboard shortcuts reference"))}</h3> <span>${escape(localize('welcomePage.keybindingsReferenceDescription', "A printable PDF with the most common keyboard shortcuts"))}</span></button></li>
|
||||
<li class="openGlobalSettings"><button data-href="command:workbench.action.openGlobalSettings"><h3>${escape(localize('welcomePage.configureSettings', "Configure settings"))}</h3> <span>${escape(localize('welcomePage.configureSettingsDescription', "Unlock the full power of VS Code by tweaking the settings"))}</span></button></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -245,13 +245,13 @@
|
|||
outline-offset: -5px;
|
||||
}
|
||||
|
||||
.monaco-workbench > .part.editor > .content .welcomePage .commands li button .currentKeymap {
|
||||
.monaco-workbench > .part.editor > .content .welcomePage .commands li button .enabledExtension {
|
||||
display: none;
|
||||
}
|
||||
.monaco-workbench > .part.editor > .content .welcomePage .commands li button .installKeymap.installed {
|
||||
.monaco-workbench > .part.editor > .content .welcomePage .commands li button .installExtension.installed {
|
||||
display: none;
|
||||
}
|
||||
.monaco-workbench > .part.editor > .content .welcomePage .commands li button .currentKeymap.installed {
|
||||
.monaco-workbench > .part.editor > .content .welcomePage .commands li button .enabledExtension.installed {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
|
|||
import { Schemas } from 'vs/base/common/network';
|
||||
import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
|
||||
import { IMessageService, Severity, CloseAction } from 'vs/platform/message/common/message';
|
||||
import { getInstalledKeymaps, IKeymapExtension, onKeymapExtensionChanged } from 'vs/workbench/parts/extensions/electron-browser/keymapExtensions';
|
||||
import { IExtensionEnablementService, IExtensionManagementService, IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
|
||||
import { getInstalledExtensions, IExtensionStatus, onExtensionChanged, isKeymapExtension } from 'vs/workbench/parts/extensions/electron-browser/extensionsUtils';
|
||||
import { IExtensionEnablementService, IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionManagement';
|
||||
import { used } from 'vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page';
|
||||
import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
|
||||
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
|
||||
|
|
@ -101,6 +101,57 @@ const reorderedQuickLinks = [
|
|||
'showInteractivePlayground',
|
||||
];
|
||||
|
||||
interface ExtensionSuggestion {
|
||||
name: string;
|
||||
id: string;
|
||||
isKeymap?: boolean;
|
||||
}
|
||||
|
||||
const extensionPacks: ExtensionSuggestion[] = [
|
||||
{ name: localize('welcomePage.javaScript', "JavaScript"), id: 'dbaeumer.vscode-eslint' },
|
||||
{ name: localize('welcomePage.typeScript', "TypeScript"), id: 'eg2.tslint' },
|
||||
{ name: localize('welcomePage.python', "Python"), id: 'donjayamanne.python' },
|
||||
// { name: localize('welcomePage.go', "Go"), id: 'lukehoban.go' },
|
||||
{ name: localize('welcomePage.php', "PHP"), id: 'felixfbecker.php-pack' },
|
||||
{ name: localize('welcomePage.docker', "Docker"), id: 'PeterJausovec.vscode-docker' },
|
||||
];
|
||||
|
||||
const keymapExtensions: ExtensionSuggestion[] = [
|
||||
{ name: localize('welcomePage.vim', "Vim"), id: 'vscodevim.vim', isKeymap: true },
|
||||
{ name: localize('welcomePage.sublime', "Sublime"), id: 'ms-vscode.sublime-keybindings', isKeymap: true },
|
||||
{ name: localize('welcomePage.atom', "Atom"), id: 'ms-vscode.atom-keybindings', isKeymap: true },
|
||||
];
|
||||
|
||||
interface Strings {
|
||||
installEvent: string;
|
||||
installedEvent: string;
|
||||
|
||||
alreadyInstalled: string;
|
||||
reloadAfterInstall: string;
|
||||
installing: string;
|
||||
extensionNotFound: string;
|
||||
}
|
||||
|
||||
const extensionPackStrings: Strings = {
|
||||
installEvent: 'installExtension',
|
||||
installedEvent: 'installedExtension',
|
||||
|
||||
alreadyInstalled: localize('welcomePage.extensionPackAlreadyInstalled', "Support for {0} is already installed."),
|
||||
reloadAfterInstall: localize('welcomePage.willReloadAfterInstallingExtensionPack', "The window will reload after installing support for {0}."),
|
||||
installing: localize('welcomePage.installingExtensionPack', "Installing support for {0}..."),
|
||||
extensionNotFound: localize('welcomePage.extensionPackNotFound', "Support for {0} with id {1} could not be found."),
|
||||
};
|
||||
|
||||
const keymapStrings: Strings = {
|
||||
installEvent: 'installKeymap',
|
||||
installedEvent: 'installedKeymap',
|
||||
|
||||
alreadyInstalled: localize('welcomePage.keymapAlreadyInstalled', "The {0} keyboard shortcuts are already installed."),
|
||||
reloadAfterInstall: localize('welcomePage.willReloadAfterInstallingKeymap', "The window will reload after installing the {0} keyboard shortcuts."),
|
||||
installing: localize('welcomePage.installingKeymap', "Installing the {0} keyboard shortcuts..."),
|
||||
extensionNotFound: localize('welcomePage.keymapNotFound', "The {0} keyboard shortcuts with id {1} could not be found."),
|
||||
};
|
||||
|
||||
class WelcomePage {
|
||||
|
||||
private disposables: IDisposable[] = [];
|
||||
|
|
@ -118,6 +169,7 @@ class WelcomePage {
|
|||
@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
|
||||
@IExtensionGalleryService private extensionGalleryService: IExtensionGalleryService,
|
||||
@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
|
||||
@IExtensionTipsService private tipsService: IExtensionTipsService,
|
||||
@ILifecycleService lifecycleService: ILifecycleService,
|
||||
@IThemeService private themeService: IThemeService,
|
||||
@ITelemetryService private telemetryService: ITelemetryService
|
||||
|
|
@ -128,18 +180,18 @@ class WelcomePage {
|
|||
|
||||
private create() {
|
||||
const recentlyOpened = this.windowService.getRecentlyOpen();
|
||||
const installedKeymaps = this.instantiationService.invokeFunction(getInstalledKeymaps);
|
||||
const installedExtensions = this.instantiationService.invokeFunction(getInstalledExtensions);
|
||||
const uri = URI.parse(require.toUrl('./vs_code_welcome_page'))
|
||||
.with({
|
||||
scheme: Schemas.walkThrough,
|
||||
query: JSON.stringify({ moduleId: 'vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page' })
|
||||
});
|
||||
const input = this.instantiationService.createInstance(WalkThroughInput, localize('welcome.title', "Welcome"), '', uri, telemetryFrom, container => this.onReady(container, recentlyOpened, installedKeymaps));
|
||||
const input = this.instantiationService.createInstance(WalkThroughInput, localize('welcome.title', "Welcome"), '', uri, telemetryFrom, container => this.onReady(container, recentlyOpened, installedExtensions));
|
||||
this.editorService.openEditor(input, { pinned: true }, Position.ONE)
|
||||
.then(null, onUnexpectedError);
|
||||
}
|
||||
|
||||
private onReady(container: HTMLElement, recentlyOpened: TPromise<{ files: string[]; folders: string[]; }>, installedKeymaps: TPromise<IKeymapExtension[]>): void {
|
||||
private onReady(container: HTMLElement, recentlyOpened: TPromise<{ files: string[]; folders: string[]; }>, installedExtensions: TPromise<IExtensionStatus[]>): void {
|
||||
const enabled = this.configurationService.lookup<boolean>(enabledKey).value;
|
||||
const showOnStartup = <HTMLInputElement>container.querySelector('#showOnStartup');
|
||||
if (enabled) {
|
||||
|
|
@ -214,32 +266,50 @@ class WelcomePage {
|
|||
quickLinks.remove();
|
||||
}
|
||||
|
||||
container.addEventListener('click', event => {
|
||||
for (let node = event.target as HTMLElement; node; node = node.parentNode as HTMLElement) {
|
||||
if (node instanceof HTMLAnchorElement && node.classList.contains('installKeymap')) {
|
||||
const keymapName = node.getAttribute('data-keymap-name');
|
||||
const keymapIdentifier = node.getAttribute('data-keymap');
|
||||
if (keymapName && keymapIdentifier) {
|
||||
this.installKeymap(keymapName, keymapIdentifier);
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
this.addExtensionList(container, '.extensionPackList', extensionPacks, extensionPackStrings);
|
||||
this.addExtensionList(container, '.keymapList', keymapExtensions, keymapStrings);
|
||||
|
||||
this.updateInstalledKeymaps(container, installedKeymaps);
|
||||
this.disposables.push(this.instantiationService.invokeFunction(onKeymapExtensionChanged)(ids => {
|
||||
this.updateInstalledExtensions(container, installedExtensions);
|
||||
this.disposables.push(this.instantiationService.invokeFunction(onExtensionChanged)(ids => {
|
||||
for (const id of ids) {
|
||||
if (container.querySelector(`.installKeymap[data-keymap="${id}"], .currentKeymap[data-keymap="${id}"]`)) {
|
||||
const installedKeymaps = this.instantiationService.invokeFunction(getInstalledKeymaps);
|
||||
this.updateInstalledKeymaps(container, installedKeymaps);
|
||||
if (container.querySelector(`.installExtension[data-extension="${id}"], .enabledExtension[data-extension="${id}"]`)) {
|
||||
const installedExtensions = this.instantiationService.invokeFunction(getInstalledExtensions);
|
||||
this.updateInstalledExtensions(container, installedExtensions);
|
||||
break;
|
||||
}
|
||||
};
|
||||
}));
|
||||
}
|
||||
|
||||
private addExtensionList(container: HTMLElement, listSelector: string, suggestions: ExtensionSuggestion[], strings: Strings) {
|
||||
const list = container.querySelector(listSelector);
|
||||
if (list) {
|
||||
suggestions.forEach((extension, i) => {
|
||||
if (i) {
|
||||
list.appendChild(document.createTextNode(localize('welcomePage.extensionListSeparator', ", ")));
|
||||
}
|
||||
|
||||
const a = document.createElement('a');
|
||||
a.innerText = extension.name;
|
||||
a.classList.add('installExtension');
|
||||
a.setAttribute('data-extension', extension.id);
|
||||
a.href = 'javascript:void(0)';
|
||||
a.addEventListener('click', e => {
|
||||
this.installExtension(extension, strings);
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
});
|
||||
list.appendChild(a);
|
||||
|
||||
const span = document.createElement('span');
|
||||
span.innerText = localize('welcomePage.installedExtension', "{0} (installed)", extension.name);
|
||||
span.classList.add('enabledExtension');
|
||||
span.setAttribute('data-extension', extension.id);
|
||||
list.appendChild(span);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private pathEquals(path1: string, path2: string): boolean {
|
||||
if (!isLinux) {
|
||||
path1 = path1.toLowerCase();
|
||||
|
|
@ -249,23 +319,23 @@ class WelcomePage {
|
|||
return path1 === path2;
|
||||
}
|
||||
|
||||
private installKeymap(keymapName: string, keymapIdentifier: string): void {
|
||||
this.telemetryService.publicLog('installKeymap', {
|
||||
private installExtension(extensionSuggestion: ExtensionSuggestion, strings: Strings): void {
|
||||
this.telemetryService.publicLog(strings.installEvent, {
|
||||
from: telemetryFrom,
|
||||
extensionId: keymapIdentifier,
|
||||
extensionId: extensionSuggestion.id,
|
||||
});
|
||||
this.instantiationService.invokeFunction(getInstalledKeymaps).then(extensions => {
|
||||
const keymap = arrays.first(extensions, extension => extension.identifier === keymapIdentifier);
|
||||
if (keymap && keymap.globallyEnabled) {
|
||||
this.telemetryService.publicLog('installedKeymap', {
|
||||
this.instantiationService.invokeFunction(getInstalledExtensions).then(extensions => {
|
||||
const installedExtension = arrays.first(extensions, extension => extension.identifier === extensionSuggestion.id);
|
||||
if (installedExtension && installedExtension.globallyEnabled) {
|
||||
this.telemetryService.publicLog(strings.installedEvent, {
|
||||
from: telemetryFrom,
|
||||
extensionId: keymapIdentifier,
|
||||
extensionId: extensionSuggestion.id,
|
||||
outcome: 'already_enabled',
|
||||
});
|
||||
this.messageService.show(Severity.Info, localize('welcomePage.keymapAlreadyInstalled', "The {0} keyboard shortcuts are already installed.", keymapName));
|
||||
this.messageService.show(Severity.Info, strings.alreadyInstalled.replace('{0}', extensionSuggestion.name));
|
||||
return;
|
||||
}
|
||||
const foundAndInstalled = keymap ? TPromise.as(true) : this.extensionGalleryService.query({ names: [keymapIdentifier] })
|
||||
const foundAndInstalled = installedExtension ? TPromise.as(true) : this.extensionGalleryService.query({ names: [extensionSuggestion.id] })
|
||||
.then(result => {
|
||||
const [extension] = result.firstPage;
|
||||
if (!extension) {
|
||||
|
|
@ -274,52 +344,52 @@ class WelcomePage {
|
|||
return this.extensionManagementService.installFromGallery(extension)
|
||||
.then(() => {
|
||||
// TODO: Do this as part of the install to avoid multiple events.
|
||||
return this.extensionEnablementService.setEnablement(keymapIdentifier, false);
|
||||
return this.extensionEnablementService.setEnablement(extensionSuggestion.id, false);
|
||||
}).then(() => {
|
||||
return true;
|
||||
});
|
||||
});
|
||||
this.messageService.show(Severity.Info, {
|
||||
message: localize('welcomePage.willReloadAfterInstallingKeymap', "The window will reload after installing the {0} keyboard shortcuts.", keymapName),
|
||||
message: strings.reloadAfterInstall.replace('{0}', extensionSuggestion.name),
|
||||
actions: [
|
||||
new Action('ok', localize('ok', "OK"), null, true, () => {
|
||||
const messageDelay = TPromise.timeout(300);
|
||||
messageDelay.then(() => {
|
||||
this.messageService.show(Severity.Info, {
|
||||
message: localize('welcomePage.installingKeymap', "Installing the {0} keyboard shortcuts...", keymapName),
|
||||
message: strings.installing.replace('{0}', extensionSuggestion.name),
|
||||
actions: [CloseAction]
|
||||
});
|
||||
});
|
||||
TPromise.join(extensions.filter(extension => extension.globallyEnabled)
|
||||
TPromise.join(extensionSuggestion.isKeymap ? extensions.filter(extension => isKeymapExtension(this.tipsService, extension) && extension.globallyEnabled)
|
||||
.map(extension => {
|
||||
return this.extensionEnablementService.setEnablement(extension.identifier, false);
|
||||
})).then(() => {
|
||||
}) : []).then(() => {
|
||||
return foundAndInstalled.then(found => {
|
||||
messageDelay.cancel();
|
||||
if (found) {
|
||||
return this.extensionEnablementService.setEnablement(keymapIdentifier, true)
|
||||
return this.extensionEnablementService.setEnablement(extensionSuggestion.id, true)
|
||||
.then(() => {
|
||||
this.telemetryService.publicLog('installedKeymap', {
|
||||
this.telemetryService.publicLog(strings.installedEvent, {
|
||||
from: telemetryFrom,
|
||||
extensionId: keymapIdentifier,
|
||||
outcome: keymap ? 'enabled' : 'installed',
|
||||
extensionId: extensionSuggestion.id,
|
||||
outcome: installedExtension ? 'enabled' : 'installed',
|
||||
});
|
||||
return this.windowService.reloadWindow();
|
||||
});
|
||||
} else {
|
||||
this.telemetryService.publicLog('installedKeymap', {
|
||||
this.telemetryService.publicLog(strings.installedEvent, {
|
||||
from: telemetryFrom,
|
||||
extensionId: keymapIdentifier,
|
||||
extensionId: extensionSuggestion.id,
|
||||
outcome: 'not_found',
|
||||
});
|
||||
this.messageService.show(Severity.Error, localize('welcomePage.keymapNotFound', "The {0} keyboard shortcuts with id {1} could not be found.", keymapName, keymapIdentifier));
|
||||
this.messageService.show(Severity.Error, strings.extensionNotFound.replace('{0}', extensionSuggestion.name).replace('{1}', extensionSuggestion.id));
|
||||
return undefined;
|
||||
}
|
||||
});
|
||||
}).then(null, err => {
|
||||
this.telemetryService.publicLog('installedKeymap', {
|
||||
this.telemetryService.publicLog(strings.installedEvent, {
|
||||
from: telemetryFrom,
|
||||
extensionId: keymapIdentifier,
|
||||
extensionId: extensionSuggestion.id,
|
||||
outcome: isPromiseCanceledError(err) ? 'canceled' : 'error',
|
||||
error: String(err),
|
||||
});
|
||||
|
|
@ -328,9 +398,9 @@ class WelcomePage {
|
|||
return TPromise.as(true);
|
||||
}),
|
||||
new Action('cancel', localize('cancel', "Cancel"), null, true, () => {
|
||||
this.telemetryService.publicLog('installedKeymap', {
|
||||
this.telemetryService.publicLog(strings.installedEvent, {
|
||||
from: telemetryFrom,
|
||||
extensionId: keymapIdentifier,
|
||||
extensionId: extensionSuggestion.id,
|
||||
outcome: 'user_canceled',
|
||||
});
|
||||
return TPromise.as(true);
|
||||
|
|
@ -338,9 +408,9 @@ class WelcomePage {
|
|||
]
|
||||
});
|
||||
}).then<void>(null, err => {
|
||||
this.telemetryService.publicLog('installedKeymap', {
|
||||
this.telemetryService.publicLog(strings.installedEvent, {
|
||||
from: telemetryFrom,
|
||||
extensionId: keymapIdentifier,
|
||||
extensionId: extensionSuggestion.id,
|
||||
outcome: isPromiseCanceledError(err) ? 'canceled' : 'error',
|
||||
error: String(err),
|
||||
});
|
||||
|
|
@ -348,22 +418,22 @@ class WelcomePage {
|
|||
});
|
||||
}
|
||||
|
||||
private updateInstalledKeymaps(container: HTMLElement, installedKeymaps: TPromise<IKeymapExtension[]>) {
|
||||
installedKeymaps.then(extensions => {
|
||||
const elements = container.querySelectorAll('.installKeymap, .currentKeymap');
|
||||
private updateInstalledExtensions(container: HTMLElement, installedExtensions: TPromise<IExtensionStatus[]>) {
|
||||
installedExtensions.then(extensions => {
|
||||
const elements = container.querySelectorAll('.installExtension, .enabledExtension');
|
||||
for (let i = 0; i < elements.length; i++) {
|
||||
elements[i].classList.remove('installed');
|
||||
}
|
||||
extensions.filter(ext => ext.globallyEnabled)
|
||||
.map(ext => ext.identifier)
|
||||
.forEach(id => {
|
||||
const install = container.querySelector(`.installKeymap[data-keymap="${id}"]`);
|
||||
if (install) {
|
||||
install.classList.add('installed');
|
||||
const install = container.querySelectorAll(`.installExtension[data-extension="${id}"]`);
|
||||
for (let i = 0; i < install.length; i++) {
|
||||
install[i].classList.add('installed');
|
||||
}
|
||||
const current = container.querySelector(`.currentKeymap[data-keymap="${id}"]`);
|
||||
if (current) {
|
||||
current.classList.add('installed');
|
||||
const enabled = container.querySelectorAll(`.enabledExtension[data-extension="${id}"]`);
|
||||
for (let i = 0; i < enabled.length; i++) {
|
||||
enabled[i].classList.add('installed');
|
||||
}
|
||||
});
|
||||
}).then(null, onUnexpectedError);
|
||||
|
|
|
|||
Loading…
Reference in a new issue