Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Emmet tweaks: simplify set/reset Emmet preferences and syntax profiles #11003

Merged
merged 1 commit into from
Aug 28, 2016
+15 −22
Merged

Emmet tweaks: simplify set/reset Emmet preferences and syntax profiles #11003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/vs/workbench/parts/emmet/node/emmet.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ declare module 'emmet' {
}

export interface Preferences {
set(key:string, value: string);
define(key:string, value: string);
remove(key:string);
reset();
}

export interface Profiles {
Expand Down Expand Up @@ -150,5 +148,13 @@ declare module 'emmet' {

export const profile: Profiles;

export function loadProfiles(profiles: any);
/**
* Loads preferences from JSON object
*/
export function loadPreferences(preferences: any): void;

/**
* Loads named profiles from JSON object
*/
export function loadProfiles(profiles: any): void;
}
23 changes: 5 additions & 18 deletions src/vs/workbench/parts/emmet/node/emmetActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,27 +89,14 @@ class LazyEmmet {
}

private updateEmmetPreferences(configurationService: IConfigurationService, _emmet: typeof emmet) {
let preferences = configurationService.getConfiguration<IEmmetConfiguration>().emmet.preferences;
for (let key in preferences) {
try {
_emmet.preferences.set(key, preferences[key]);
} catch (err) {
_emmet.preferences.define(key, preferences[key]);
}
}
let syntaxProfiles = configurationService.getConfiguration<IEmmetConfiguration>().emmet.syntaxProfiles;
_emmet.profile.reset();
_emmet.loadProfiles(syntaxProfiles);
let emmetPreferences = configurationService.getConfiguration<IEmmetConfiguration>().emmet;
_emmet.loadPreferences(emmetPreferences.preferences);
_emmet.loadProfiles(emmetPreferences.syntaxProfiles);
}

private resetEmmetPreferences(configurationService: IConfigurationService, _emmet: typeof emmet) {
let preferences = configurationService.getConfiguration<IEmmetConfiguration>().emmet.preferences;
for (let key in preferences) {
try {
_emmet.preferences.remove(key);
} catch (err) {
}
}
_emmet.preferences.reset();
_emmet.profile.reset();
}

private _withEmmetPreferences(configurationService: IConfigurationService, _emmet: typeof emmet, callback: (_emmet: typeof emmet) => void): void {
Expand Down