diff --git a/data/fixtures/scopes/cpp/interior/interior.lambda.block.scope b/data/fixtures/scopes/cpp/interior/interior.lambda.scope similarity index 100% rename from data/fixtures/scopes/cpp/interior/interior.lambda.block.scope rename to 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 deleted file mode 100644 index 6d85ffaf2f..0000000000 --- a/data/fixtures/scopes/csharp/interior/interior.lambda.expression.scope +++ /dev/null @@ -1,25 +0,0 @@ -() => 0; ---- - -[#1 Content] = -[#1 Removal] = 0:1-0:1 - >< -0| () => 0; - -[#1 Domain] = 0:0-0:2 - >--< -0| () => 0; - -[#1 Insertion delimiter] = " " - - -[#2 Content] = -[#2 Removal] = 0:6-0:7 - >-< -0| () => 0; - -[#2 Domain] = 0:0-0:7 - >-------< -0| () => 0; - -[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/interior/interior.lambda.block.scope b/data/fixtures/scopes/csharp/interior/interior.lambda.scope similarity index 100% rename from data/fixtures/scopes/csharp/interior/interior.lambda.block.scope rename to 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 deleted file mode 100644 index 3a555ea9b5..0000000000 --- a/data/fixtures/scopes/java/interior/interior.lambda.expression.scope +++ /dev/null @@ -1,25 +0,0 @@ -() -> 0; ---- - -[#1 Content] = -[#1 Removal] = 0:1-0:1 - >< -0| () -> 0; - -[#1 Domain] = 0:0-0:2 - >--< -0| () -> 0; - -[#1 Insertion delimiter] = " " - - -[#2 Content] = -[#2 Removal] = 0:6-0:7 - >-< -0| () -> 0; - -[#2 Domain] = 0:0-0:7 - >-------< -0| () -> 0; - -[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/interior/interior.lambda.block.scope b/data/fixtures/scopes/java/interior/interior.lambda.scope similarity index 100% rename from data/fixtures/scopes/java/interior/interior.lambda.block.scope rename to 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 deleted file mode 100644 index 6d85ffaf2f..0000000000 --- a/data/fixtures/scopes/javascript.core/interior/interior.lambda.expression.scope +++ /dev/null @@ -1,25 +0,0 @@ -() => 0; ---- - -[#1 Content] = -[#1 Removal] = 0:1-0:1 - >< -0| () => 0; - -[#1 Domain] = 0:0-0:2 - >--< -0| () => 0; - -[#1 Insertion delimiter] = " " - - -[#2 Content] = -[#2 Removal] = 0:6-0:7 - >-< -0| () => 0; - -[#2 Domain] = 0:0-0:7 - >-------< -0| () => 0; - -[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/interior/interior.lambda.block.scope b/data/fixtures/scopes/javascript.core/interior/interior.lambda.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/interior/interior.lambda.block.scope rename to 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 deleted file mode 100644 index a889bc2430..0000000000 --- a/data/fixtures/scopes/python/interior/interior.lambda.expression.scope +++ /dev/null @@ -1,13 +0,0 @@ -lambda: pass ---- - -[Content] = -[Removal] = 0:8-0:12 - >----< -0| lambda: pass - -[Domain] = 0:0-0:12 - >------------< -0| lambda: pass - -[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/interior/interior.lambda.expression2.scope b/data/fixtures/scopes/python/interior/interior.lambda.expression2.scope deleted file mode 100644 index af724a71b6..0000000000 --- a/data/fixtures/scopes/python/interior/interior.lambda.expression2.scope +++ /dev/null @@ -1,13 +0,0 @@ -lambda x: x ---- - -[Content] = -[Removal] = 0:10-0:11 - >-< -0| lambda x: x - -[Domain] = 0:0-0:11 - >-----------< -0| lambda x: x - -[Insertion delimiter] = " " diff --git a/data/scopeSupportFacetInfos.md b/data/scopeSupportFacetInfos.md index 11c7a0097b..fedfab009d 100644 --- 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 index cbf3eacbc9..be2c9465f1 100644 --- 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 index ae77d7a157..6c9a8a2ef8 100644 --- 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 index 66f8e7d755..b44745db48 100644 --- 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 index 9ad8979b81..42c98619a4 100644 --- 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 index f862c7a638..329b2be23d 100644 --- 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 index e51ff82871..bb4cbd634a 100644 --- 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 index 8beed33e2a..87cb0f78ff 100644 --- 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 index 4bc3bf84d8..6af49b5aab 100644 --- 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 index 9c176bf4ce..e11aaaf3ae 100644 --- 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 index 817bf6a72c..23a43f0365 100644 --- 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 index d068d34bb8..2c46a8e625 100644 --- 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 index f52c962edf..b7c1c48032 100644 --- 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 index 1bf1e6d8a1..057445c5c0 100644 --- 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 index 42e0e08714..ac06679579 100644 --- 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 index 684ed64497..b3fce9db69 100644 --- 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 index e29e6a6d49..0f686d2c7b 100644 --- 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 index 014b9fe3bd..e60b9c29e9 100644 --- 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,