Remove lambda expression from interior scope (#3021)

AndreasArvidsson · web-flow · commit e758f39f842a · 2025-07-06T20:54:12.000+02:00
This was just implemented and was actually really unintuitive and broke
my workflow.
diff --git a/data/fixtures/scopes/cpp/interior/interior.lambda.scope b/data/fixtures/scopes/cpp/interior/interior.lambda.scope
diff --git a/data/fixtures/scopes/csharp/interior/interior.lambda.expression.scope b/data/fixtures/scopes/csharp/interior/interior.lambda.expression.scope
diff --git a/data/fixtures/scopes/csharp/interior/interior.lambda.scope b/data/fixtures/scopes/csharp/interior/interior.lambda.scope
diff --git a/data/fixtures/scopes/java/interior/interior.lambda.expression.scope b/data/fixtures/scopes/java/interior/interior.lambda.expression.scope
diff --git a/data/fixtures/scopes/java/interior/interior.lambda.scope b/data/fixtures/scopes/java/interior/interior.lambda.scope
diff --git a/data/fixtures/scopes/javascript.core/interior/interior.lambda.expression.scope b/data/fixtures/scopes/javascript.core/interior/interior.lambda.expression.scope
diff --git a/data/fixtures/scopes/javascript.core/interior/interior.lambda.scope b/data/fixtures/scopes/javascript.core/interior/interior.lambda.scope
diff --git a/data/fixtures/scopes/python/interior/interior.lambda.expression.scope b/data/fixtures/scopes/python/interior/interior.lambda.expression.scope
diff --git a/data/fixtures/scopes/python/interior/interior.lambda.expression2.scope b/data/fixtures/scopes/python/interior/interior.lambda.expression2.scope
diff --git a/data/scopeSupportFacetInfos.md b/data/scopeSupportFacetInfos.md
@@ -187,8 +187,7 @@
 - `interior.function` The body of a function declaration
 - `interior.if` The body of an if/elif/else branch
 - `interior.interface` The body of a interface
-- `interior.lambda.block` The block body of a lambda/anonymous function
-- `interior.lambda.expression` The expression body of a lambda/anonymous function
+- `interior.lambda` The block body of a lambda/anonymous function
 - `interior.method` The body of a method declaration
 - `interior.namespace` the body of a namespace statement
 - `interior.resource` the body of a 'with' / 'use' / 'using' statement
diff --git a/packages/common/src/scopeSupportFacets/c.ts b/packages/common/src/scopeSupportFacets/c.ts
@@ -246,8 +246,7 @@ export const cScopeSupport: LanguageScopeSupportFacetMap = {
   "argumentList.formal.lambda.empty": notApplicable,
   "argumentList.formal.lambda.multiLine": notApplicable,
   "argumentList.formal.lambda.singleLine": notApplicable,
-  "interior.lambda.block": notApplicable,
-  "interior.lambda.expression": notApplicable,
+  "interior.lambda": notApplicable,
   "value.return.lambda": notApplicable,
   anonymousFunction: notApplicable,
 
diff --git a/packages/common/src/scopeSupportFacets/cpp.ts b/packages/common/src/scopeSupportFacets/cpp.ts
@@ -76,7 +76,7 @@ export const cppScopeSupport: LanguageScopeSupportFacetMap = {
   "type.typeArgument": supported,
   "type.typeArgument.iteration": supported,
 
-  "interior.lambda.block": supported,
+  "interior.lambda": supported,
   "interior.try": supported,
   "interior.foreach": supported,
   "interior.constructor": supported,
@@ -85,6 +85,5 @@ export const cppScopeSupport: LanguageScopeSupportFacetMap = {
 
   /* NOT APPLICABLE */
 
-  "interior.lambda.expression": notApplicable,
   "value.return.lambda": notApplicable,
 };
diff --git a/packages/common/src/scopeSupportFacets/csharp.ts b/packages/common/src/scopeSupportFacets/csharp.ts
@@ -203,8 +203,7 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.constructor": supported,
   "interior.method": supported,
   "interior.if": supported,
-  "interior.lambda.block": supported,
-  "interior.lambda.expression": supported,
+  "interior.lambda": supported,
   "interior.for": supported,
   "interior.foreach": supported,
   "interior.while": supported,
diff --git a/packages/common/src/scopeSupportFacets/css.ts b/packages/common/src/scopeSupportFacets/css.ts
@@ -175,8 +175,7 @@ export const cssScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.constructor": notApplicable,
   "interior.method": notApplicable,
   "interior.if": notApplicable,
-  "interior.lambda.block": notApplicable,
-  "interior.lambda.expression": notApplicable,
+  "interior.lambda": notApplicable,
   "interior.for": notApplicable,
   "interior.foreach": notApplicable,
   "interior.while": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/html.ts b/packages/common/src/scopeSupportFacets/html.ts
@@ -151,8 +151,7 @@ export const htmlScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.constructor": notApplicable,
   "interior.method": notApplicable,
   "interior.if": notApplicable,
-  "interior.lambda.block": notApplicable,
-  "interior.lambda.expression": notApplicable,
+  "interior.lambda": notApplicable,
   "interior.for": notApplicable,
   "interior.foreach": notApplicable,
   "interior.while": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/java.ts b/packages/common/src/scopeSupportFacets/java.ts
@@ -177,8 +177,7 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.constructor": supported,
   "interior.method": supported,
   "interior.if": supported,
-  "interior.lambda.block": supported,
-  "interior.lambda.expression": supported,
+  "interior.lambda": supported,
   "interior.for": supported,
   "interior.foreach": supported,
   "interior.while": supported,
diff --git a/packages/common/src/scopeSupportFacets/javascript.ts b/packages/common/src/scopeSupportFacets/javascript.ts
@@ -173,8 +173,7 @@ export const javascriptCoreScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.constructor": supported,
   "interior.method": supported,
   "interior.if": supported,
-  "interior.lambda.block": supported,
-  "interior.lambda.expression": supported,
+  "interior.lambda": supported,
   "interior.for": supported,
   "interior.foreach": supported,
   "interior.while": supported,
diff --git a/packages/common/src/scopeSupportFacets/json.ts b/packages/common/src/scopeSupportFacets/json.ts
@@ -165,8 +165,7 @@ export const jsonScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.constructor": notApplicable,
   "interior.method": notApplicable,
   "interior.if": notApplicable,
-  "interior.lambda.block": notApplicable,
-  "interior.lambda.expression": notApplicable,
+  "interior.lambda": notApplicable,
   "interior.for": notApplicable,
   "interior.foreach": notApplicable,
   "interior.while": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/markdown.ts b/packages/common/src/scopeSupportFacets/markdown.ts
@@ -160,8 +160,7 @@ export const markdownScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.constructor": notApplicable,
   "interior.method": notApplicable,
   "interior.if": notApplicable,
-  "interior.lambda.block": notApplicable,
-  "interior.lambda.expression": notApplicable,
+  "interior.lambda": notApplicable,
   "interior.for": notApplicable,
   "interior.foreach": notApplicable,
   "interior.while": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/python.ts b/packages/common/src/scopeSupportFacets/python.ts
@@ -152,7 +152,6 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.function": supported,
   "interior.constructor": supported,
   "interior.method": supported,
-  "interior.lambda.expression": supported,
   "interior.if": supported,
   "interior.try": supported,
   "interior.switch": supported,
@@ -272,7 +271,7 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   // Multiline lambda
   "argumentList.formal.lambda.multiLine": notApplicable,
   "argument.formal.lambda.multiLine": notApplicable,
-  "interior.lambda.block": notApplicable,
+  "interior.lambda": notApplicable,
 
   // Block comments
   "comment.block": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/r.ts b/packages/common/src/scopeSupportFacets/r.ts
@@ -53,8 +53,7 @@ export const rScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.class": unsupported,
   "interior.function": unsupported,
   "interior.if": unsupported,
-  "interior.lambda.block": unsupported,
-  "interior.lambda.expression": unsupported,
+  "interior.lambda": unsupported,
   "interior.try": unsupported,
   "key.attribute": unsupported,
   "name.class": unsupported,
diff --git a/packages/common/src/scopeSupportFacets/scm.ts b/packages/common/src/scopeSupportFacets/scm.ts
@@ -160,8 +160,7 @@ export const scmScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.constructor": notApplicable,
   "interior.method": notApplicable,
   "interior.if": notApplicable,
-  "interior.lambda.block": notApplicable,
-  "interior.lambda.expression": notApplicable,
+  "interior.lambda": notApplicable,
   "interior.for": notApplicable,
   "interior.foreach": notApplicable,
   "interior.while": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts
@@ -910,14 +910,10 @@ export const scopeSupportFacetInfos: Record<
     description: "The body of a method declaration",
     scopeType: { type: "interior" },
   },
-  "interior.lambda.block": {
+  "interior.lambda": {
     description: "The block body of a lambda/anonymous function",
     scopeType: { type: "interior" },
   },
-  "interior.lambda.expression": {
-    description: "The expression body of a lambda/anonymous function",
-    scopeType: { type: "interior" },
-  },
   "interior.if": {
     description: "The body of an if/elif/else branch",
     scopeType: { type: "interior" },
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts
@@ -251,8 +251,7 @@ export const scopeSupportFacets = [
   "interior.function",
   "interior.constructor",
   "interior.method",
-  "interior.lambda.block",
-  "interior.lambda.expression",
+  "interior.lambda",
   "interior.element",
   "interior.command",
   "interior.cell",
diff --git a/packages/common/src/scopeSupportFacets/talon.ts b/packages/common/src/scopeSupportFacets/talon.ts
@@ -180,8 +180,7 @@ export const talonScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.constructor": notApplicable,
   "interior.method": notApplicable,
   "interior.if": notApplicable,
-  "interior.lambda.block": notApplicable,
-  "interior.lambda.expression": notApplicable,
+  "interior.lambda": notApplicable,
   "interior.for": notApplicable,
   "interior.foreach": notApplicable,
   "interior.while": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/xml.ts b/packages/common/src/scopeSupportFacets/xml.ts
@@ -159,8 +159,7 @@ export const xmlScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.constructor": notApplicable,
   "interior.method": notApplicable,
   "interior.if": notApplicable,
-  "interior.lambda.block": notApplicable,
-  "interior.lambda.expression": notApplicable,
+  "interior.lambda": notApplicable,
   "interior.for": notApplicable,
   "interior.foreach": notApplicable,
   "interior.while": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/yaml.ts b/packages/common/src/scopeSupportFacets/yaml.ts
@@ -169,8 +169,7 @@ export const yamlScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.constructor": notApplicable,
   "interior.method": notApplicable,
   "interior.if": notApplicable,
-  "interior.lambda.block": notApplicable,
-  "interior.lambda.expression": notApplicable,
+  "interior.lambda": notApplicable,
   "interior.for": notApplicable,
   "interior.foreach": notApplicable,
   "interior.while": notApplicable,
