From 61bb522a6424407602f4df65dda4be09c61d1b15 Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Mon, 8 Dec 2025 08:57:56 -0600
Subject: [PATCH] fix: W-8095488 (ternary without space gets treated as
 optional chaining)

---
 grammars/apex.tmLanguage                      |  2 +-
 grammars/apex.tmLanguage.cson                 |  2 +-
 grammars/soql.tmLanguage                      |  2 +-
 src/apex.tmLanguage.yml                       |  3 +-
 .../classes/TernaryWithDecimals_W8095488.cls  | 88 +++++++++++++++++++
 .../TernaryWithDecimals_W8095488.cls-meta.xml |  6 ++
 6 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 test/repros/force-app/main/default/classes/TernaryWithDecimals_W8095488.cls
 create mode 100644 test/repros/force-app/main/default/classes/TernaryWithDecimals_W8095488.cls-meta.xml

diff --git a/grammars/apex.tmLanguage b/grammars/apex.tmLanguage
index a9d52cc..62891de 100644
--- a/grammars/apex.tmLanguage
+++ b/grammars/apex.tmLanguage
@@ -3798,7 +3798,7 @@
       <key>conditional-operator</key>
       <dict>
         <key>begin</key>
-        <string>(?&lt;!\?)\?(?!\?|\.|\[)</string>
+        <string>(?&lt;!\?)\?(?!\?|\.(?!\d)|\[)</string>
         <key>beginCaptures</key>
         <dict>
           <key>0</key>
diff --git a/grammars/apex.tmLanguage.cson b/grammars/apex.tmLanguage.cson
index 4accb9c..c32ff83 100644
--- a/grammars/apex.tmLanguage.cson
+++ b/grammars/apex.tmLanguage.cson
@@ -2242,7 +2242,7 @@ repository:
       }
     ]
   'conditional-operator':
-    begin: '(?<!\\?)\\?(?!\\?|\\.|\\[)'
+    begin: '(?<!\\?)\\?(?!\\?|\\.(?!\\d)|\\[)'
     beginCaptures:
       '0':
         name: 'keyword.operator.conditional.question-mark.apex'
diff --git a/grammars/soql.tmLanguage b/grammars/soql.tmLanguage
index f679de1..1dc4acc 100644
--- a/grammars/soql.tmLanguage
+++ b/grammars/soql.tmLanguage
@@ -3780,7 +3780,7 @@
       <key>conditional-operator</key>
       <dict>
         <key>begin</key>
-        <string>(?&lt;!\?)\?(?!\?|\.|\[)</string>
+        <string>(?&lt;!\?)\?(?!\?|\.(?!\d)|\[)</string>
         <key>beginCaptures</key>
         <dict>
           <key>0</key>
diff --git a/src/apex.tmLanguage.yml b/src/apex.tmLanguage.yml
index 5915856..3fe8b27 100644
--- a/src/apex.tmLanguage.yml
+++ b/src/apex.tmLanguage.yml
@@ -1342,7 +1342,8 @@ repository:
     # Only match ? if:
     # 1. There isn't a preceding or trailing ? (null-coalescing operator)
     # 2. There isn't a trailing . or [ (null-conditional operator)
-    begin: (?<!\?)\?(?!\?|\.|\[)
+    # 3. UNLESS the trailing . is followed by a digit (decimal literal like ?.34)
+    begin: (?<!\?)\?(?!\?|\.(?!\d)|\[)
     beginCaptures:
       '0': { name: keyword.operator.conditional.question-mark.apex }
     end: ':'
diff --git a/test/repros/force-app/main/default/classes/TernaryWithDecimals_W8095488.cls b/test/repros/force-app/main/default/classes/TernaryWithDecimals_W8095488.cls
new file mode 100644
index 0000000..f0d6503
--- /dev/null
+++ b/test/repros/force-app/main/default/classes/TernaryWithDecimals_W8095488.cls
@@ -0,0 +1,88 @@
+/**
+ * W-8095488: Ternary expression with decimals syntax highlighting
+ * 
+ * When a ternary expression contains a decimal literal and spaces are excluded,
+ * the question mark may be incorrectly tokenized as a safe navigation operator
+ * instead of a ternary operator.
+ */
+public class TernaryWithDecimals_W8095488 {
+    
+    // With spaces - should work correctly
+    public void ternaryWithSpaces() {
+        Boolean b = true;
+        Decimal d = b ? .34 : 0;
+        Decimal i = b?.123 : 0;
+    }
+    
+    // Without spaces - potential tokenization issue
+    public void ternaryWithoutSpaces() {
+        Boolean b = true;
+        Decimal d = b?.34:0;
+        Decimal i = b?.123:0;
+    }
+    
+    // Mixed scenarios
+    public void mixedScenarios() {
+        Boolean b = true;
+        
+        // Space before question mark, no space after
+        Decimal d1 = b ?.34:0;
+        
+        // No space before, space after
+        Decimal d2 = b? .34:0;
+        
+        // Space after question mark, no space around colon
+        Decimal d3 = b? .34:0;
+        
+        // All spaces
+        Decimal d4 = b ? .34 : 0;
+        
+        // Integer values (for comparison)
+        Integer i1 = b?1:0;
+        Integer i2 = b ? 1 : 0;
+    }
+    
+    // Safe navigation operator (for comparison)
+    public void safeNavigationOperator() {
+        String s = 'test';
+        Integer len = s?.length();
+        
+        Account acc;
+        String name = acc?.Name;
+    }
+    
+    // Complex expressions
+    public void complexExpressions() {
+        Boolean b = true;
+        
+        // Ternary in switch
+        switch on (b) {
+            when true {
+                Decimal d = b?.34:0;
+                String s = 'SUCCESS';
+            }
+        }
+        
+        // Nested ternary with decimals
+        Decimal nested = b ? (b?.5:.25) : .0;
+        
+        // Ternary with decimal in variable declaration
+        Decimal inline = b?.99:0;
+    }
+    
+    // Property access vs ternary
+    public void propertyVsTernary() {
+        Boolean b = true;
+        
+        // These should be ternary operators, not safe navigation
+        Decimal d = b?.34:0;
+        Decimal i = b?.123:0;
+        
+        // This is safe navigation
+        String type = this?.type;
+    }
+    
+    String type = 'test';
+}
+
+
diff --git a/test/repros/force-app/main/default/classes/TernaryWithDecimals_W8095488.cls-meta.xml b/test/repros/force-app/main/default/classes/TernaryWithDecimals_W8095488.cls-meta.xml
new file mode 100644
index 0000000..259683a
--- /dev/null
+++ b/test/repros/force-app/main/default/classes/TernaryWithDecimals_W8095488.cls-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>58.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
+