Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-14 14:24:10 +02:00
Code Activity

Added option for autocomplete on enter

Browse source
This commit is contained in:
Brian Fiete 2020-05-12 09:16:39 -07:00
parent 6c65993401
commit 5e5084886c
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
IDE/src/Settings.bf
View file

@ -310,6 +310,7 @@ namespace IDE
public Colors mColors = new .() ~ delete _; public Colors mColors = new .() ~ delete _;
public AutoCompleteShowKind mAutoCompleteShowKind = .PanelIfVisible; public AutoCompleteShowKind mAutoCompleteShowKind = .PanelIfVisible;
public bool mAutoCompleteRequireTab = false; public bool mAutoCompleteRequireTab = false;
public bool mAutoCompleteOnEnter = true;
public bool mAutoCompleteShowDocumentation = true; public bool mAutoCompleteShowDocumentation = true;
public bool mShowLocatorAnim = true; public bool mShowLocatorAnim = true;
public bool mHiliteCursorReferences = true; public bool mHiliteCursorReferences = true;
@ -331,6 +332,7 @@ namespace IDE
sd.Add("UIScale", mUIScale); sd.Add("UIScale", mUIScale);
sd.Add("AutoCompleteShowKind", mAutoCompleteShowKind); sd.Add("AutoCompleteShowKind", mAutoCompleteShowKind);
sd.Add("AutoCompleteRequireTab", mAutoCompleteRequireTab); sd.Add("AutoCompleteRequireTab", mAutoCompleteRequireTab);
sd.Add("AutoCompleteOnEnter", mAutoCompleteOnEnter);
sd.Add("AutoCompleteShowDocumentation", mAutoCompleteShowDocumentation); sd.Add("AutoCompleteShowDocumentation", mAutoCompleteShowDocumentation);
sd.Add("ShowLocatorAnim", mShowLocatorAnim); sd.Add("ShowLocatorAnim", mShowLocatorAnim);
sd.Add("HiliteCursorReferences", mHiliteCursorReferences); sd.Add("HiliteCursorReferences", mHiliteCursorReferences);
@ -358,6 +360,7 @@ namespace IDE
sd.Get("UIScale", ref mUIScale); sd.Get("UIScale", ref mUIScale);
sd.Get("AutoCompleteShowKind", ref mAutoCompleteShowKind); sd.Get("AutoCompleteShowKind", ref mAutoCompleteShowKind);
sd.Get("AutoCompleteRequireTab", ref mAutoCompleteRequireTab); sd.Get("AutoCompleteRequireTab", ref mAutoCompleteRequireTab);
sd.Get("AutoCompleteOnEnter", ref mAutoCompleteOnEnter);
sd.Get("AutoCompleteShowDocumentation", ref mAutoCompleteShowDocumentation); sd.Get("AutoCompleteShowDocumentation", ref mAutoCompleteShowDocumentation);
sd.Get("ShowLocatorAnim", ref mShowLocatorAnim); sd.Get("ShowLocatorAnim", ref mShowLocatorAnim);
sd.Get("HiliteCursorReferences", ref mHiliteCursorReferences); sd.Get("HiliteCursorReferences", ref mHiliteCursorReferences);

1
IDE/src/ui/SettingsDialog.bf
View file

@ -78,6 +78,7 @@ namespace IDE.ui
AddPropertiesItem(category, "UI Scale", "mUIScale"); AddPropertiesItem(category, "UI Scale", "mUIScale");
AddPropertiesItem(category, "Autocomplete", "mAutoCompleteShowKind"); AddPropertiesItem(category, "Autocomplete", "mAutoCompleteShowKind");
AddPropertiesItem(category, "Autocomplete Require Tab", "mAutoCompleteRequireTab"); AddPropertiesItem(category, "Autocomplete Require Tab", "mAutoCompleteRequireTab");
AddPropertiesItem(category, "Autocomplete on Enter", "mAutoCompleteOnEnter");
AddPropertiesItem(category, "Autocomplete Show Documentation", "mAutoCompleteShowDocumentation"); AddPropertiesItem(category, "Autocomplete Show Documentation", "mAutoCompleteShowDocumentation");
AddPropertiesItem(category, "Show Locator Animation", "mShowLocatorAnim"); AddPropertiesItem(category, "Show Locator Animation", "mShowLocatorAnim");
AddPropertiesItem(category, "Hilite Symbol at Cursor", "mHiliteCursorReferences"); AddPropertiesItem(category, "Hilite Symbol at Cursor", "mHiliteCursorReferences");

6
IDE/src/ui/SourceEditWidgetContent.bf
View file

@ -2091,7 +2091,11 @@ namespace IDE.ui
return; return;
} }
bool isCompletionChar = ((keyChar == '\t') || (keyChar == '\r')) && (!mWidgetWindow.IsKeyDown(.Shift)); bool isCompletionChar =
((keyChar == '\t') ||
((keyChar == '\r') && (gApp.mSettings.mEditorSettings.mAutoCompleteOnEnter))) &&
(!mWidgetWindow.IsKeyDown(.Shift));
if ((gApp.mSymbolReferenceHelper != null) && (gApp.mSymbolReferenceHelper.IsRenaming)) if ((gApp.mSymbolReferenceHelper != null) && (gApp.mSymbolReferenceHelper.IsRenaming))
{ {
if ((keyChar == '\r') || (keyChar == '\n')) if ((keyChar == '\r') || (keyChar == '\n'))