提交 28bfd5b7 编写于 作者: J Jackson Kearl 提交者: Ramya Rao

Disable snippets in extension search (when not in suggest dropdown) (#55281)

* Disable snippits in extension search (when not in suggest dropdown)

* Add monaco input contributions

* Fix bug preventing snippetSuggestions from taking effect in sub-editors
上级 d730969c
......@@ -1752,13 +1752,11 @@ export class EditorOptionsValidator {
}
private static _sanitizeSuggestOpts(opts: IEditorOptions, defaults: InternalSuggestOptions): InternalSuggestOptions {
if (!opts.suggest) {
return defaults;
}
const suggestOpts = opts.suggest || {};
return {
filterGraceful: _boolean(opts.suggest.filterGraceful, defaults.filterGraceful),
filterGraceful: _boolean(suggestOpts.filterGraceful, defaults.filterGraceful),
snippets: _stringSet<'top' | 'bottom' | 'inline' | 'none'>(opts.snippetSuggestions, defaults.snippets, ['top', 'bottom', 'inline', 'none']),
snippetsPreventQuickSuggestions: _boolean(opts.suggest.snippetsPreventQuickSuggestions, defaults.filterGraceful),
snippetsPreventQuickSuggestions: _boolean(suggestOpts.snippetsPreventQuickSuggestions, defaults.filterGraceful),
};
}
......
......@@ -65,7 +65,11 @@ import { Range } from 'vs/editor/common/core/range';
import { Position } from 'vs/editor/common/core/position';
import { ITextModel } from 'vs/editor/common/model';
import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions } from 'vs/workbench/parts/codeEditor/electron-browser/simpleEditorOptions';
import { getSimpleEditorOptions } from 'vs/workbench/parts/codeEditor/electron-browser/simpleEditorOptions';
import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
import { ContextMenuController } from 'vs/editor/contrib/contextmenu/contextmenu';
import { MenuPreventer } from 'vs/workbench/parts/codeEditor/electron-browser/menuPreventer';
import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
interface SearchInputEvent extends Event {
target: HTMLInputElement;
......@@ -342,7 +346,14 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
this.monacoStyleContainer = append(header, $('.monaco-container'));
this.searchBox = this.instantiationService.createInstance(CodeEditorWidget, this.monacoStyleContainer,
mixinHTMLInputStyleOptions(getSimpleEditorOptions(), localize('searchExtensions', "Search Extensions in Marketplace")),
getSimpleCodeEditorWidgetOptions());
{
isSimpleWidget: true, contributions: [
SuggestController,
SnippetController2,
ContextMenuController,
MenuPreventer
]
});
this.placeholderText = append(this.monacoStyleContainer, $('.search-placeholder', null, localize('searchExtensions', "Search Extensions in Marketplace")));
......@@ -680,6 +691,7 @@ function mixinHTMLInputStyleOptions(config: IEditorOptions, ariaLabel?: string):
config.scrollbar.vertical = 'hidden';
config.ariaLabel = ariaLabel || '';
config.cursorWidth = 1;
config.snippetSuggestions = 'none';
config.fontFamily = ' -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif';
return config;
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册