generalize env context for completion

texstudio-org · Dec 21, 2024 · 3b9ebd2 · 3b9ebd2
1 parent 54143c9
commit 3b9ebd2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/latexeditorview.cpp b/src/latexeditorview.cpp
@@ -216,8 +216,10 @@ bool DefaultInputBinding::keyPressEvent(QKeyEvent *event, QEditor *editor)
             const LatexDocument *doc = qobject_cast<LatexDocument *>(editor->document());
             StackEnvironment env;
             doc->getEnv(editor->cursor().lineNumber(),env);
-            if(!env.isEmpty() && env.top().name=="%expl3"){
-                LatexEditorView::completer->setFilter("%expl3");
+            // use topEnv as completion filter for commands
+            const QStringList ignoreEnv = {"document","normal"};
+            if(!env.isEmpty() && !ignoreEnv.contains(env.top().name)){
+                LatexEditorView::completer->setFilter(env.top().name);
             }
 
             LatexCompleter::CompletionFlags flags= ctx==EnumsTokenType::width ? LatexCompleter::CF_FORCE_LENGTH : LatexCompleter::CompletionFlag(0) ;

diff --git a/src/texstudio.cpp b/src/texstudio.cpp
@@ -4873,6 +4873,15 @@ void Texstudio::normalCompletion()
                     return;
                 }
             }
+        } else {
+            // use topEnv as completion filter for commands
+            if( type == Token::command && !env.isEmpty()){
+                // skip filter for normal or document
+                const QStringList ignoreEnv = {"document","normal"};
+                if(!ignoreEnv.contains(env.top().name)){
+                    completer->setFilter(env.top().name);
+                }
+            }
         }
     }
 	switch (type) {