css scope migration

data/fixtures/scopes/css/name.iteration.block.scope

@@ -0,0 +1,13 @@
+a { color: red; }
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-0:17
+  >-----------------<
+0| a { color: red; }
+
+
+[#2 Range] =
+[#2 Domain] = 0:3-0:16
+     >-------------<
+0| a { color: red; }

data/fixtures/scopes/css/name.iteration.document.scope

@@ -0,0 +1,7 @@
+/* hello */
+---
+
+[Range] =
+[Domain] = 0:0-0:11
+  >-----------<
+0| /* hello */

data/fixtures/scopes/scss/functionName.iteration.document.scope

@@ -0,0 +1,7 @@
+/* hello */
+---
+
+[Range] =
+[Domain] = 0:0-0:11
+  >-----------<
+0| /* hello */

data/fixtures/scopes/scss/functionName.iteration.scope

@@ -0,0 +1,13 @@
+a { color: red; }
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-0:17
+  >-----------------<
+0| a { color: red; }
+
+
+[#2 Range] =
+[#2 Domain] = 0:3-0:16
+     >-------------<
+0| a { color: red; }

data/fixtures/scopes/scss/index.json

@@ -0,0 +1,3 @@
+{
+  "imports": ["css"]
+}

data/fixtures/scopes/scss/namedFunction.iteration.document.scope

@@ -0,0 +1,7 @@
+/* hello */
+---
+
+[Range] =
+[Domain] = 0:0-0:11
+  >-----------<
+0| /* hello */

data/fixtures/scopes/scss/namedFunction.iteration.scope

@@ -0,0 +1,13 @@
+a { color: red; }
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-0:17
+  >-----------------<
+0| a { color: red; }
+
+
+[#2 Range] =
+[#2 Domain] = 0:3-0:16
+     >-------------<
+0| a { color: red; }

packages/common/src/scopeSupportFacets/css.ts

@@ -12,4 +12,6 @@ export const cssScopeSupport: LanguageScopeSupportFacetMap = {
   "comment.line": supported,
   "comment.block": supported,
   "string.singleLine": supported,
+  "name.iteration.block": supported,
+  "name.iteration.document": supported,
 };

packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts

@@ -124,6 +124,21 @@ export const scopeSupportFacetInfos: Record<
     description: "A named method declaration in a class",
     scopeType: "namedFunction",
   },
+  "namedFunction.method.iteration.class": {
+    description: "Iteration scope for named functions: class bodies",
+    scopeType: "namedFunction",
+    isIteration: true,
+  },
+  "namedFunction.iteration": {
+    description: "Iteration scope for named functions",
+    scopeType: "namedFunction",
+    isIteration: true,
+  },
+  "namedFunction.iteration.document": {
+    description: "Iteration scope for named functions: the entire document",
+    scopeType: "namedFunction",
+    isIteration: true,
+  },
   anonymousFunction: {
     description:
       "An anonymous function, eg a lambda function, an arrow function, etc",
@@ -133,6 +148,25 @@ export const scopeSupportFacetInfos: Record<
     description: "The name of a function",
     scopeType: "functionName",
   },
+  "functionName.method": {
+    description: "The name of a method in a class",
+    scopeType: "functionName",
+  },
+  "functionName.method.iteration.class": {
+    description: "Iteration scope for function names: class bodies",
+    scopeType: "functionName",
+    isIteration: true,
+  },
+  "functionName.iteration": {
+    description: "Iteration scope for function names",
+    scopeType: "functionName",
+    isIteration: true,
+  },
+  "functionName.iteration.document": {
+    description: "Iteration scope for function names: the entire document",
+    scopeType: "functionName",
+    isIteration: true,
+  },
 
   functionCall: {
     description: "A function call",
@@ -299,6 +333,17 @@ export const scopeSupportFacetInfos: Record<
     scopeType: "name",
     isIteration: true,
   },
+  "name.iteration.block": {
+    description:
+      "Iteration scope for names: statement blocks (body of functions/if classes/for loops/etc).",
+    scopeType: "name",
+    isIteration: true,
+  },
+  "name.iteration.document": {
+    description: "Iteration scope for names: the entire document",
+    scopeType: "name",
+    isIteration: true,
+  },
   "key.attribute": {
     description: "Key (LHS) of an attribute eg in an xml element",
     scopeType: "collectionKey",

packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts

@@ -31,8 +31,15 @@ const scopeSupportFacets = [
   "className.iteration.block",
   "namedFunction",
   "namedFunction.method",
+  "namedFunction.method.iteration.class",
+  "namedFunction.iteration",
+  "namedFunction.iteration.document",
   "anonymousFunction",
   "functionName",
+  "functionName.method",
+  "functionName.method.iteration.class",
+  "functionName.iteration",
+  "functionName.iteration.document",
 
   "functionCall",
   "functionCall.constructor",
@@ -76,6 +83,8 @@ const scopeSupportFacets = [
   "name.resource.iteration",
   "name.argument.formal",
   "name.argument.formal.iteration",
+  "name.iteration.block",
+  "name.iteration.document",
 
   "key.attribute",
   "key.mapPair",

packages/common/src/scopeSupportFacets/scss.ts

@@ -11,4 +11,9 @@ const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel;
 
 export const scssScopeSupport: LanguageScopeSupportFacetMap = {
   ...cssScopeSupport,
+
+  "namedFunction.iteration": supported,
+  "namedFunction.iteration.document": supported,
+  "functionName.iteration": supported,
+  "functionName.iteration.document": supported,
 };

queries/css.scm

@@ -18,3 +18,11 @@
 (attribute_selector
   (attribute_name) @name
 ) @_.domain
+
+(stylesheet) @name.iteration
+(block
+  .
+  "{" @name.iteration.start.endOf
+  "}" @name.iteration.end.startOf
+  .
+)

queries/scss.scm

@@ -18,3 +18,11 @@
 (parameter
   (variable_name) @name
 ) @_.domain
+
+(stylesheet) @namedFunction.iteration @functionName.iteration
+(block
+  .
+  "{" @namedFunction.iteration.start.endOf @functionName.iteration.start.endOf
+  "}" @namedFunction.iteration.end.startOf @functionName.iteration.end.startOf
+  .
+)