Remove interior.ternary scope facet (#3071)

AndreasArvidsson · web-flow · commit 2da41e45f10c · 2025-08-16T17:32:06.000+02:00
Discussion #3067 (comment)
diff --git a/data/fixtures/scopes/c/interior/interior.ternary.scope b/data/fixtures/scopes/c/interior/interior.ternary.scope
diff --git a/data/fixtures/scopes/csharp/interior/interior.ternary.scope b/data/fixtures/scopes/csharp/interior/interior.ternary.scope
diff --git a/data/fixtures/scopes/java/interior/interior.ternary.scope b/data/fixtures/scopes/java/interior/interior.ternary.scope
diff --git a/data/fixtures/scopes/javascript.core/interior/interior.ternary.scope b/data/fixtures/scopes/javascript.core/interior/interior.ternary.scope
diff --git a/data/fixtures/scopes/python/interior/interior.ternary.scope b/data/fixtures/scopes/python/interior/interior.ternary.scope
diff --git a/data/scopeSupportFacetInfos.md b/data/scopeSupportFacetInfos.md
@@ -185,7 +185,6 @@
 - `interior.surroundingPair` The interior scope of a surrounding pair
 - `interior.switch` The body of a switch statement
 - `interior.switchCase` The body of a switch case branch
-- `interior.ternary` The body of a ternary condition/branch
 - `interior.try` The body of a try/catch/finally branch
 - `interior.while` The body of a while loop
 
diff --git a/packages/common/src/scopeSupportFacets/c.ts b/packages/common/src/scopeSupportFacets/c.ts
@@ -131,7 +131,6 @@ export const cCoreScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.if": supported,
   "interior.switch": supported,
   "interior.switchCase": supported,
-  "interior.ternary": supported,
   "interior.for": supported,
   "interior.while": supported,
   "interior.doWhile": supported,
diff --git a/packages/common/src/scopeSupportFacets/csharp.ts b/packages/common/src/scopeSupportFacets/csharp.ts
@@ -220,7 +220,6 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.doWhile": supported,
   "interior.switch": supported,
   "interior.switchCase": supported,
-  "interior.ternary": supported,
   "interior.try": supported,
 
   "collectionItem.unenclosed.singleLine": supported,
diff --git a/packages/common/src/scopeSupportFacets/css.ts b/packages/common/src/scopeSupportFacets/css.ts
@@ -292,7 +292,6 @@ export const cssScopeSupport: LanguageScopeSupportFacetMap = {
   "branch.ternary": notApplicable,
   "branch.ternary.iteration": notApplicable,
   "condition.ternary": notApplicable,
-  "interior.ternary": notApplicable,
 
   // Section
   section: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/html.ts b/packages/common/src/scopeSupportFacets/html.ts
@@ -284,7 +284,6 @@ export const htmlScopeSupport: LanguageScopeSupportFacetMap = {
   "branch.ternary": notApplicable,
   "branch.ternary.iteration": notApplicable,
   "condition.ternary": notApplicable,
-  "interior.ternary": notApplicable,
 
   // Section
   section: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/java.ts b/packages/common/src/scopeSupportFacets/java.ts
@@ -198,7 +198,6 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.doWhile": supported,
   "interior.switch": supported,
   "interior.switchCase": supported,
-  "interior.ternary": supported,
   "interior.try": supported,
   "interior.resource": supported,
   "interior.static": supported,
diff --git a/packages/common/src/scopeSupportFacets/javascript.ts b/packages/common/src/scopeSupportFacets/javascript.ts
@@ -192,7 +192,6 @@ export const javascriptCoreScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.doWhile": supported,
   "interior.switch": supported,
   "interior.switchCase": supported,
-  "interior.ternary": supported,
   "interior.try": supported,
   "interior.static": supported,
 
diff --git a/packages/common/src/scopeSupportFacets/json.ts b/packages/common/src/scopeSupportFacets/json.ts
@@ -271,7 +271,6 @@ export const jsonScopeSupport: LanguageScopeSupportFacetMap = {
   "branch.ternary": notApplicable,
   "branch.ternary.iteration": notApplicable,
   "condition.ternary": notApplicable,
-  "interior.ternary": notApplicable,
 
   // Section
   section: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/markdown.ts b/packages/common/src/scopeSupportFacets/markdown.ts
@@ -287,7 +287,6 @@ export const markdownScopeSupport: LanguageScopeSupportFacetMap = {
   "branch.ternary": notApplicable,
   "branch.ternary.iteration": notApplicable,
   "condition.ternary": notApplicable,
-  "interior.ternary": notApplicable,
 
   // Element
   element: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/python.ts b/packages/common/src/scopeSupportFacets/python.ts
@@ -148,7 +148,6 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.try": supported,
   "interior.switch": supported,
   "interior.switchCase": supported,
-  "interior.ternary": supported,
   "interior.foreach": supported,
   "interior.while": supported,
   "interior.resource": supported,
diff --git a/packages/common/src/scopeSupportFacets/scm.ts b/packages/common/src/scopeSupportFacets/scm.ts
@@ -278,7 +278,6 @@ export const scmScopeSupport: LanguageScopeSupportFacetMap = {
   "branch.ternary": notApplicable,
   "branch.ternary.iteration": notApplicable,
   "condition.ternary": notApplicable,
-  "interior.ternary": notApplicable,
 
   // Section
   section: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts
@@ -1003,10 +1003,6 @@ export const scopeSupportFacetInfos: Record<
     description: "The body of a switch case branch",
     scopeType: { type: "interior" },
   },
-  "interior.ternary": {
-    description: "The body of a ternary condition/branch",
-    scopeType: { type: "interior" },
-  },
   "interior.for": {
     description: "The body of a for loop",
     scopeType: { type: "interior" },
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts
@@ -274,7 +274,6 @@ export const scopeSupportFacets = [
   "interior.try",
   "interior.switch",
   "interior.switchCase",
-  "interior.ternary",
   "interior.for",
   "interior.foreach",
   "interior.while",
diff --git a/packages/common/src/scopeSupportFacets/talon.ts b/packages/common/src/scopeSupportFacets/talon.ts
@@ -289,7 +289,6 @@ export const talonScopeSupport: LanguageScopeSupportFacetMap = {
   "branch.ternary": notApplicable,
   "branch.ternary.iteration": notApplicable,
   "condition.ternary": notApplicable,
-  "interior.ternary": notApplicable,
 
   // Section
   section: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/xml.ts b/packages/common/src/scopeSupportFacets/xml.ts
@@ -284,7 +284,6 @@ export const xmlScopeSupport: LanguageScopeSupportFacetMap = {
   "branch.ternary": notApplicable,
   "branch.ternary.iteration": notApplicable,
   "condition.ternary": notApplicable,
-  "interior.ternary": notApplicable,
 
   // Section
   section: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/yaml.ts b/packages/common/src/scopeSupportFacets/yaml.ts
@@ -280,7 +280,6 @@ export const yamlScopeSupport: LanguageScopeSupportFacetMap = {
   "branch.ternary": notApplicable,
   "branch.ternary.iteration": notApplicable,
   "condition.ternary": notApplicable,
-  "interior.ternary": notApplicable,
 
   // Section
   section: notApplicable,
diff --git a/queries/c.scm b/queries/c.scm
@@ -433,20 +433,13 @@
 
 ;;!! true ? 0 : 1
 ;;!  ^^^^
+;;!         ^   ^
 (conditional_expression
-  condition: (_) @condition @interior
+  condition: (_) @condition
+  consequence: (_) @branch
 ) @condition.domain @branch.iteration
-
-;;!! true ? 0 : 1
-;;!         ^
-(conditional_expression
-  consequence: (_) @branch @interior
-)
-
-;;!! true ? 0 : 1
-;;!             ^
 (conditional_expression
-  alternative: (_) @branch @interior
+  alternative: (_) @branch
 )
 
 ;;!! int foo, bar;
diff --git a/queries/csharp.scm b/queries/csharp.scm
@@ -178,15 +178,11 @@
 ;;!  ^^^^
 ;;!         ^   ^
 (conditional_expression
-  condition: (_) @condition @interior
+  condition: (_) @condition
+  consequence: (_) @branch
 ) @condition.domain @branch.iteration
-
-(conditional_expression
-  consequence: (_) @branch @interior
-)
-
 (conditional_expression
-  alternative: (_) @branch @interior
+  alternative: (_) @branch
 )
 
 ;;!! class Foo {}
diff --git a/queries/java.scm b/queries/java.scm
@@ -323,21 +323,17 @@
   (#child-range! @value 0 -1 true true)
 ) @_.domain
 
-;;!! true ? 1 : 2
+;;!! true ? 0 : 1
+;;!  ^^^^
+;;!         ^   ^
 (ternary_expression
-  condition: (_) @condition @interior
-) @condition.domain
-(ternary_expression
-  consequence: (_) @branch @interior
-)
+  condition: (_) @condition
+  consequence: (_) @branch
+) @condition.domain @branch.iteration
 (ternary_expression
-  alternative: (_) @branch @interior
+  alternative: (_) @branch
 )
 
-;;!! true ? 1 : 2
-;;!  ^^^^^^^^^^^^
-(ternary_expression) @branch.iteration
-
 ;;!! void myFunk(int value) {}
 ;;!                  ^^^^^
 ;;!  -------------------------
diff --git a/queries/javascript.core.scm b/queries/javascript.core.scm
@@ -630,15 +630,11 @@
 ;;!         ^   ^
 ;;! -------------
 (ternary_expression
-  condition: (_) @condition @interior
+  condition: (_) @condition
+  consequence: (_) @branch
 ) @condition.domain @branch.iteration
-
-(ternary_expression
-  consequence: (_) @branch @interior
-)
-
 (ternary_expression
-  alternative: (_) @branch @interior
+  alternative: (_) @branch
 )
 
 ;;!! for (let i = 0; i < 2; ++i) {}
diff --git a/queries/python.scm b/queries/python.scm
