modify-logic

Author: Darshan808

IPython/core/completer.py

@@ -2368,45 +2368,42 @@ def _determine_completion_context(self, line):
         """
         Determine whether the cursor is in an attribute or global completion context.
         """
+        # Cursor in string/comment → GLOBAL.
         if self._is_in_string_or_comment(line):
             return self._CompletionContextType.GLOBAL
-        if line.endswith("."):
-            return self._CompletionContextType.ATTRIBUTE
-
-        last_token_match = re.search(r"([\w]+)$", line)
-        if not last_token_match:
-            return self._CompletionContextType.GLOBAL
 
-        prefix = line[: last_token_match.start()]
-        chain_match = re.search(r"(.*)\.(\w*)$", prefix.rstrip())
+        # Match 'anything-dot-word' at end for attribute context.
+        # Ex: 'obj.', 'np.random.ran'.
+        chain_match = re.search(r"(.+)\.(\w*)$", line)
         if chain_match:
+            prefix = chain_match.group(1)
+            # If prefix is a number → GLOBAL (no attributes).
+            # Ex: '3.', '-42.5.'.
+            if re.fullmatch(r"[-+]?\d*\.?\d+", prefix):
+                return self._CompletionContextType.GLOBAL
             return self._CompletionContextType.ATTRIBUTE
 
+        # No attribute pattern → GLOBAL.
+        # Ex: 'var', ''.
         return self._CompletionContextType.GLOBAL
 
     def _is_in_string_or_comment(self, text):
-        # Check for comments
-        if "#" in text:
-            parts = text.split("#")
-            if len(parts) > 1:
-                return True
-
         in_single_quote = False
         in_double_quote = False
         in_triple_single = False
         in_triple_double = False
-        in_fstring = False
-        in_fstring_expression = False
+        in_template_string = False  # Covers both f-strings and t-strings
+        in_expression = False  # For expressions in f/t-strings
         i = 0
 
         while i < len(text):
-            # Check for f-string start
+            # Check for f-string or t-string start
             if (
                 i + 1 < len(text)
-                and text[i] == "f"
+                and text[i] in ("f", "t")
                 and (text[i + 1] == '"' or text[i + 1] == "'")
             ):
-                in_fstring = True
+                in_template_string = True
                 i += 1
 
             # Handle triple quotes
@@ -2433,11 +2430,11 @@ def _is_in_string_or_comment(self, text):
                 i += 2
                 continue
 
-            # Handle f-string expressions
-            if in_fstring and text[i] == "{":
-                in_fstring_expression = True
-            elif in_fstring and text[i] == "}":
-                in_fstring_expression = False
+            # Handle expressions in f-strings or t-strings
+            if in_template_string and text[i] == "{":
+                in_expression = True
+            elif in_template_string and text[i] == "}":
+                in_expression = False
 
             # Handle quotes
             if (
@@ -2455,10 +2452,22 @@ def _is_in_string_or_comment(self, text):
             ):
                 in_single_quote = not in_single_quote
 
+            # Check for comment
+            if text[i] == "#" and (
+                not (
+                    in_single_quote
+                    or in_double_quote
+                    or in_triple_single
+                    or in_triple_double
+                )
+                or in_expression
+            ):
+                return True
+
             i += 1
 
-        # If we're in an f-string expression, return False
-        if in_fstring_expression:
+        # If we're in an expression (f-string or t-string), return False
+        if in_expression:
             return False
 
         # Otherwise, return True if we're in any type of string

tests/test_completer.py

@@ -1801,18 +1801,26 @@ def _(expected):
         # Dots in string literals
         ('some_var = "this is a string with a dot.', "global"),
         ("text = 'another string with a dot.", "global"),
+        ('f"greeting {user.na', "attribute"),  # Cursor in f-string expression
+        ('t"welcome {guest.na', "attribute"),  # Cursor in t-string expression
+        ('f"hello {name} worl', "global"),  # Cursor in f-string outside expression
         # Backslash escapes in strings
         ('var = "string with \\"escaped quote and a dot.', "global"),
         ("escaped = 'single \\'quote\\' with a dot.", "global"),
         # Multi-line strings
         ('multi = """This is line one\nwith a dot.', "global"),
         ("multi_single = '''Another\nmulti-line\nwith a dot.", "global"),
-        # Inline comments with dots
-        ("x = 5  # This is a comment with a dot.", "global"),
+        # Inline comments
+        ("x = 5  # This is a comment", "global"),
         ("y = obj.method()  # Comment after dot.method", "global"),
+        # Hash symbol within string literals should not be treated as comments
+        ("d['#'] = np.", "attribute"),
         # Nested parentheses with dots
         ("complex_expr = (func((obj.method(param.attr", "attribute"),
         ("multiple_nesting = {key: [value.attr", "attribute"),
+        # Numbers
+        ("3.", "global"),
+        ("-42.14", "global"),
         # Additional cases
         ('str_with_code = "x.attr', "global"),
         ('f"formatted {obj.attr', "attribute"),