From f7ebcbd97b4e843aa5b2f06296eae4a2e159da66 Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Sun, 19 Feb 2023 09:09:23 +0100 Subject: [PATCH] ide: Autocomple now ignores dv___ items (layout placeholders) --- uppsrc/ide/Assist.cpp | 13 +++++++------ uppsrc/ide/main.cpp | 4 ++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp index 1c99ae78a..23c32fd37 100644 --- a/uppsrc/ide/Assist.cpp +++ b/uppsrc/ide/Assist.cpp @@ -713,12 +713,13 @@ void AssistEditor::Assist(bool macros) assist_type.Add(""); if(has_globals) assist_type.Add(Null); - for(const AutoCompleteItem& m : items) { - AssistItem& f = assist_item.Add(); - (AutoCompleteItem&)f = m; - f.uname = ToUpper(f.name); - f.typei = assist_type.FindAdd(f.kind == CXCursor_MacroDefinition ? "" : f.parent); - } + for(const AutoCompleteItem& m : items) + if(!m.name.StartsWith("dv___")) { + AssistItem& f = assist_item.Add(); + (AutoCompleteItem&)f = m; + f.uname = ToUpper(f.name); + f.typei = assist_type.FindAdd(f.kind == CXCursor_MacroDefinition ? "" : f.parent); + } PopUpAssist(); }); } diff --git a/uppsrc/ide/main.cpp b/uppsrc/ide/main.cpp index 4612b196b..c423eea83 100644 --- a/uppsrc/ide/main.cpp +++ b/uppsrc/ide/main.cpp @@ -145,6 +145,10 @@ void OnCrash() #endif } +INITBLOCK { // libclang does not work in Linux unless this is set + SetEnv("LC_CTYPE", "en_US.UTF-8"); +} + #ifdef flagMAIN GUI_APP_MAIN #else