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

Clear disposables in the clearInput method on Disposables #77479

Merged
merged 16 commits into from Jul 17, 2019
Merged

Clear disposables in the clearInput method on Disposables #77479

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4a38038
Added clear input method to clear disposables.
DTeachs Jul 16, 2019
d79071a
Fixed formatting to pass the hygiene tests
DTeachs Jul 16, 2019
5746289
Fixed formatting
DTeachs Jul 16, 2019
c77c660
Fixed compilation errors
DTeachs Jul 16, 2019
bc78d52
Revert "Fixed compilation errors"
DTeachs Jul 16, 2019
eecec90
Revert "Fixed formatting"
DTeachs Jul 16, 2019
47365df
Revert "Added clear input method to clear disposables."
DTeachs Jul 16, 2019
2d7f80b
Undid unneccesary changes for the sake of the pull request.
DTeachs Jul 16, 2019
920963a
Revert "Fixed compilation errors"
DTeachs Jul 16, 2019
1b0fd26
Undid uri.ts changes
DTeachs Jul 16, 2019
a1f3542
Update uri.ts
DTeachs Jul 17, 2019
083cca4
Edits
DTeachs Jul 17, 2019
afcd2bc
Fixed formatting
DTeachs Jul 17, 2019
d928313
Revert "Fixed formatting"
DTeachs Jul 17, 2019
5b1d433
Revert "Edits"
DTeachs Jul 17, 2019
b5136de
Fixed changes and refactored so method structures in the file are sam…
DTeachs Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,13 @@ export class ExtensionEditor extends BaseEditor {
}));
}

clearInput(): void {
this.contentDisposables.clear();
this.transientDisposables.clear();

super.clearInput();
}

focus(): void {
if (this.activeElement) {
this.activeElement.focus();
Expand Down Expand Up @@ -843,7 +850,7 @@ export class ExtensionEditor extends BaseEditor {
const contributes = manifest.contributes;
const colors = contributes && contributes.colors;

if (!colors || !colors.length) {
This conversation was marked as resolved.
Show resolved Hide resolved
if (!(colors && colors.length)) {
return false;
}

Expand Down Expand Up @@ -926,12 +933,12 @@ export class ExtensionEditor extends BaseEditor {
menus[context].forEach(menu => {
let command = byId[menu.command];

if (!command) {
if (command) {
command.menus.push(context);
} else {
command = { id: menu.command, title: '', keybindings: [], menus: [context] };
byId[command.id] = command;
commands.push(command);
} else {
command.menus.push(context);
}
});
});
Expand All @@ -947,12 +954,12 @@ export class ExtensionEditor extends BaseEditor {

let command = byId[rawKeybinding.command];

if (!command) {
if (command) {
command.keybindings.push(keybinding);
} else {
command = { id: rawKeybinding.command, title: '', keybindings: [keybinding], menus: [] };
byId[command.id] = command;
commands.push(command);
} else {
command.keybindings.push(keybinding);
}
});

Expand Down Expand Up @@ -1006,12 +1013,12 @@ export class ExtensionEditor extends BaseEditor {
grammars.forEach(grammar => {
let language = byId[grammar.language];

if (!language) {
if (language) {
language.hasGrammar = true;
} else {
language = { id: grammar.language, name: grammar.language, extensions: [], hasGrammar: true, hasSnippets: false };
byId[language.id] = language;
languages.push(language);
} else {
language.hasGrammar = true;
}
});

Expand All @@ -1020,12 +1027,12 @@ export class ExtensionEditor extends BaseEditor {
snippets.forEach(snippet => {
let language = byId[snippet.language];

if (!language) {
if (language) {
language.hasSnippets = true;
} else {
language = { id: snippet.language, name: snippet.language, extensions: [], hasGrammar: false, hasSnippets: true };
byId[language.id] = language;
languages.push(language);
} else {
language.hasSnippets = true;
}
});

Expand Down Expand Up @@ -1067,11 +1074,11 @@ export class ExtensionEditor extends BaseEditor {
}

const keyBinding = KeybindingParser.parseKeybinding(key || rawKeyBinding.key, OS);
if (!keyBinding) {
return null;
}
if (keyBinding) {
return this.keybindingService.resolveKeybinding(keyBinding)[0];

return this.keybindingService.resolveKeybinding(keyBinding)[0];
}
return null;
}

private loadContents<T>(loadingTask: () => CacheResult<T>): Promise<T> {
Expand Down