type.class

Author: AndreasArvidsson

data/fixtures/scopes/python/class2.scope

@@ -0,0 +1,15 @@
+@value
+class MyClass:
+    pass
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-2:8
+  >------
+0| @value
+1| class MyClass:
+2|     pass
+   --------<
+
+[Insertion delimiter] = "\n\n"

data/fixtures/scopes/python/type.class.scope

@@ -0,0 +1,13 @@
+class MyClass:
+    pass
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-1:8
+  >--------------
+0| class MyClass:
+1|     pass
+   --------<
+
+[Insertion delimiter] = " "

data/fixtures/scopes/python/type.class2.scope

@@ -0,0 +1,15 @@
+@value
+class MyClass:
+    pass
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-2:8
+  >------
+0| @value
+1| class MyClass:
+2|     pass
+   --------<
+
+[Insertion delimiter] = " "

packages/common/src/scopeSupportFacets/python.ts

@@ -48,6 +48,8 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   "value.variable": supported,
   "value.variable.pattern": supported,
 
+  "type.class": supported,
+
   anonymousFunction: supported,
   namedFunction: supported,
   "namedFunction.constructor": supported,
@@ -168,6 +170,7 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   "textFragment.comment.block": notApplicable,
   "textFragment.element": notApplicable,
   "value.attribute": notApplicable,
+  "value.typeAlias": notApplicable,
   attribute: notApplicable,
   command: notApplicable,
   element: notApplicable,
@@ -178,24 +181,25 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   section: notApplicable,
   startTag: notApplicable,
   tags: notApplicable,
-
-  //   "value.typeAlias": supported,
-  //   "type.alias":,
-  //   "type.argument.formal":,
-  //   "type.argument.formal.constructor":,
-  //   "type.argument.formal.constructor.iteration":,
-  //   "type.argument.formal.iteration":,
-  //   "type.argument.formal.method":,
-  //   "type.argument.formal.method.iteration":,
-  //   "type.cast":,
-  //   "type.class":,
-  //   "type.enum":,
-  //   "type.field":,
-  //   "type.field.iteration":,
-  //   "type.foreach":,
-  //   "type.interface":,
-  //   "type.return":,
-  //   "type.typeArgument":,
-  //   "type.typeArgument.iteration":,
-  //   "type.variable":,
+  "type.alias": notApplicable,
+
+  //   "type.argument.formal": notApplicable,
+  //   "type.argument.formal.constructor": notApplicable,
+  //   "type.argument.formal.constructor.iteration": notApplicable,
+  //   "type.argument.formal.iteration": notApplicable,
+  //   "type.argument.formal.method": notApplicable,
+  //   "type.argument.formal.method.iteration": notApplicable,
+  //   "type.return": notApplicable,
+  //   "type.field": notApplicable,
+  //   "type.field.iteration": notApplicable,
+
+  //   "type.cast": notApplicable,
+  //   "type.enum": notApplicable,
+  //   "type.foreach": notApplicable,
+  //   "type.interface": notApplicable,
+  //   "type.resource": notApplicable,
+  //   "type.resource.iteration": notApplicable,
+  //   "type.typeArgument": notApplicable,
+  //   "type.typeArgument.iteration": notApplicable,
+  //   "type.variable": notApplicable,
 };

queries/python.scm

@@ -297,20 +297,33 @@
   )
 ) @namedFunction @functionName.domain @interior.domain
 
+;;!! class MyClass:
 (
   (class_definition
     name: (_) @className
     body: (_) @interior
   ) @class @className.domain @interior.domain
   (#not-parent-type? @class decorated_definition)
 )
+
+(
+  (class_definition) @type
+  (#not-parent-type? @type decorated_definition)
+)
+
+;;!! @value
+;;!! class MyClass:
 (decorated_definition
   (class_definition
     name: (_) @className
     body: (_) @interior
   )
 ) @class @className.domain @interior.domain
 
+(decorated_definition
+  (class_definition)
+) @type
+
 (
   (module) @class.iteration @className.iteration
   (#document-range! @class.iteration @className.iteration)