Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #57380

Browse Source
This commit is contained in:
Rob Lourens
2018-09-17 10:43:59 -07:00
parent dde08a9a62
commit 2f73a6d314
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/parts/codeEditor/browser/media/suggestEnabledInput.css
+5 -1
View File
@@ -24,4 +24,8 @@
pointer-events: none;
margin-top: 2px;
margin-left: 1px;
}
}
.suggest-input-container .monaco-editor .suggest-widget.no-icons .monaco-list .icon {
display: none;
}
src/vs/workbench/parts/codeEditor/browser/suggestEnabledInput.ts
+25 -14
View File
@@ -124,8 +124,16 @@ export class SuggestEnabledInput extends Widget implements IThemable {
this.stylingContainer = append(parent, $('.suggest-input-container'));
this.placeholderText = append(this.stylingContainer, $('.suggest-input-placeholder', null, options.placeholderText || ''));
const editorOptions: IEditorOptions = {
...getSimpleEditorOptions(),
...getHTMLInputStyleOptions(ariaLabel),
...{
iconsInSuggestions: false
}
};
this.inputWidget = instantiationService.createInstance(CodeEditorWidget, this.stylingContainer,
mixinHTMLInputStyleOptions(getSimpleEditorOptions(), ariaLabel),
editorOptions,
{
contributions: [SuggestController, SnippetController2, ContextMenuController, MenuPreventer],
isSimpleWidget: true,
@@ -244,17 +252,20 @@ export class SuggestEnabledInput extends Widget implements IThemable {
}
function mixinHTMLInputStyleOptions(config: IEditorOptions, ariaLabel?: string): IEditorOptions {
config.fontSize = 13;
config.lineHeight = 22;
config.wordWrap = 'off';
config.scrollbar.vertical = 'hidden';
config.roundedSelection = false;
config.ariaLabel = ariaLabel || '';
config.renderIndentGuides = false;
config.cursorWidth = 1;
config.snippetSuggestions = 'none';
config.suggest = { filterGraceful: false };
config.fontFamily = ' -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif';
return config;
function getHTMLInputStyleOptions(ariaLabel?: string): IEditorOptions {
return <IEditorOptions>{
fontSize: 13,
lineHeight: 22,
wordWrap: 'off',
scrollbar: {
vertical: 'hidden',
},
roundedSelection: false,
ariaLabel: ariaLabel || '',
renderIndentGuides: false,
cursorWidth: 1,
snippetSuggestions: 'none',
suggest: { filterGraceful: false },
fontFamily: ' -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif',
};
}