From 35efc898e2914dd6a7ed15f8b9c27f02486fb57e Mon Sep 17 00:00:00 2001
From: Colin Alworth <colinalworth@deephaven.io>
Date: Mon, 5 Dec 2022 16:46:41 -0600
Subject: [PATCH] Correct a merge conflict from #3123

---
 .../io/deephaven/server/console/ConsoleServiceGrpcImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java
index c767e0798b7..d7a5e49fe22 100644
--- a/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java
@@ -260,10 +260,10 @@ public void bindTableToVariable(BindTableToVariableRequest request,
     public StreamObserver<AutoCompleteRequest> autoCompleteStream(
             StreamObserver<AutoCompleteResponse> responseObserver) {
         return GrpcUtil.rpcWrapper(log, responseObserver, () -> {
+            final SessionState session = sessionService.getCurrentSession();
             if (AUTOCOMPLETE_DISABLED) {
-                return new NoopAutoCompleteObserver(responseObserver);
+                return new NoopAutoCompleteObserver(session, responseObserver);
             }
-            final SessionState session = sessionService.getCurrentSession();
             if (PythonDeephavenSession.SCRIPT_TYPE.equals(scriptSessionProvider.get().scriptType())) {
                 PyObject[] settings = new PyObject[1];
                 safelyExecute(() -> {