name.namespace

AndreasArvidsson · AndreasArvidsson · commit a7d62ad27634 · 2025-06-30T14:53:02.000+02:00
diff --git a/data/fixtures/scopes/cpp/interior.namespace.scope b/data/fixtures/scopes/cpp/interior.namespace.scope
@@ -1,25 +1,25 @@
-namespace NS { }
+namespace Foo { }
 ---
 
 [#1 Content] =
-[#1 Removal] = 0:14-0:15
-                >-<
-0| namespace NS { }
+[#1 Removal] = 0:15-0:16
+                 >-<
+0| namespace Foo { }
 
-[#1 Domain] = 0:0-0:16
-  >----------------<
-0| namespace NS { }
+[#1 Domain] = 0:0-0:17
+  >-----------------<
+0| namespace Foo { }
 
 [#1 Insertion delimiter] = " "
 
 
 [#2 Content] =
-[#2 Removal] = 0:14-0:15
-                >-<
-0| namespace NS { }
+[#2 Removal] = 0:15-0:16
+                 >-<
+0| namespace Foo { }
 
-[#2 Domain] = 0:13-0:16
-               >---<
-0| namespace NS { }
+[#2 Domain] = 0:14-0:17
+                >---<
+0| namespace Foo { }
 
 [#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/cpp/name.class.scope b/data/fixtures/scopes/cpp/name.class.scope
@@ -1,48 +1,24 @@
-class aaa {};
-enum class ccc {};
+class Foo {};
 ---
 
-[#1 Content] = 0:6-0:9
+[Content] = 0:6-0:9
         >---<
-0| class aaa {};
+0| class Foo {};
 
-[#1 Removal] = 0:6-0:10
+[Removal] = 0:6-0:10
         >----<
-0| class aaa {};
+0| class Foo {};
 
-[#1 Leading delimiter] = 0:5-0:6
+[Leading delimiter] = 0:5-0:6
        >-<
-0| class aaa {};
+0| class Foo {};
 
-[#1 Trailing delimiter] = 0:9-0:10
+[Trailing delimiter] = 0:9-0:10
            >-<
-0| class aaa {};
+0| class Foo {};
 
-[#1 Domain] = 0:0-0:13
+[Domain] = 0:0-0:13
   >-------------<
-0| class aaa {};
+0| class Foo {};
 
-[#1 Insertion delimiter] = " "
-
-
-[#2 Content] = 1:11-1:14
-             >---<
-1| enum class ccc {};
-
-[#2 Removal] = 1:11-1:15
-             >----<
-1| enum class ccc {};
-
-[#2 Leading delimiter] = 1:10-1:11
-            >-<
-1| enum class ccc {};
-
-[#2 Trailing delimiter] = 1:14-1:15
-                >-<
-1| enum class ccc {};
-
-[#2 Domain] = 1:0-1:18
-  >------------------<
-1| enum class ccc {};
-
-[#2 Insertion delimiter] = " "
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/cpp/name.class2.scope b/data/fixtures/scopes/cpp/name.class2.scope
@@ -0,0 +1,24 @@
+enum class Foo {};
+---
+
+[Content] = 0:11-0:14
+             >---<
+0| enum class Foo {};
+
+[Removal] = 0:11-0:15
+             >----<
+0| enum class Foo {};
+
+[Leading delimiter] = 0:10-0:11
+            >-<
+0| enum class Foo {};
+
+[Trailing delimiter] = 0:14-0:15
+                >-<
+0| enum class Foo {};
+
+[Domain] = 0:0-0:18
+  >------------------<
+0| enum class Foo {};
+
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/cpp/name.namespace.scope b/data/fixtures/scopes/cpp/name.namespace.scope
@@ -0,0 +1,24 @@
+namespace Foo { }
+---
+
+[Content] = 0:10-0:13
+            >---<
+0| namespace Foo { }
+
+[Removal] = 0:10-0:14
+            >----<
+0| namespace Foo { }
+
+[Leading delimiter] = 0:9-0:10
+           >-<
+0| namespace Foo { }
+
+[Trailing delimiter] = 0:13-0:14
+               >-<
+0| namespace Foo { }
+
+[Domain] = 0:0-0:17
+  >-----------------<
+0| namespace Foo { }
+
+[Insertion delimiter] = " "
diff --git a/packages/common/src/scopeSupportFacets/c.ts b/packages/common/src/scopeSupportFacets/c.ts
@@ -272,5 +272,6 @@ export const cScopeSupport: LanguageScopeSupportFacetMap = {
   "type.typeArgument.iteration": notApplicable,
 
   // Namespace
+  "name.namespace": notApplicable,
   "interior.namespace": notApplicable,
 };
diff --git a/packages/common/src/scopeSupportFacets/cpp.ts b/packages/common/src/scopeSupportFacets/cpp.ts
@@ -53,6 +53,7 @@ export const cppScopeSupport: LanguageScopeSupportFacetMap = {
   "name.constructor": supported,
   "name.foreach": supported,
   "name.method": supported,
+  "name.namespace": supported,
 
   "value.argument.formal": supported,
   "value.argument.formal.iteration": supported,
diff --git a/packages/common/src/scopeSupportFacets/csharp.ts b/packages/common/src/scopeSupportFacets/csharp.ts
@@ -239,14 +239,19 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   "collectionItem.unenclosed.iteration": notApplicable,
   "collectionItem.unenclosed": notApplicable,
 
+  // Namespace
+  "name.namespace": notApplicable,
+  "interior.namespace": notApplicable,
+
+  // Branch loop
+  "branch.loop": notApplicable,
+  "branch.loop.iteration": notApplicable,
+
   // Miscellaneous
   environment: notApplicable,
   pairDelimiter: notApplicable,
   regularExpression: notApplicable,
   selector: notApplicable,
   unit: notApplicable,
-  "interior.namespace": notApplicable,
   "interior.static": notApplicable,
-  "branch.loop": notApplicable,
-  "branch.loop.iteration": notApplicable,
 };
diff --git a/packages/common/src/scopeSupportFacets/css.ts b/packages/common/src/scopeSupportFacets/css.ts
@@ -146,6 +146,7 @@ export const cssScopeSupport: LanguageScopeSupportFacetMap = {
   "name.assignment.pattern": notApplicable,
   "name.assignment": notApplicable,
   "name.class": notApplicable,
+  "name.namespace": notApplicable,
   "name.constructor": notApplicable,
   "name.field": notApplicable,
   "name.foreach": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/html.ts b/packages/common/src/scopeSupportFacets/html.ts
@@ -130,6 +130,7 @@ export const htmlScopeSupport: LanguageScopeSupportFacetMap = {
   "name.resource": notApplicable,
   "name.variable.pattern": notApplicable,
   "name.variable": notApplicable,
+  "name.namespace": notApplicable,
   "namedFunction.constructor": notApplicable,
   "namedFunction.iteration.block": notApplicable,
   "namedFunction.iteration.document": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/java.ts b/packages/common/src/scopeSupportFacets/java.ts
@@ -240,11 +240,16 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "type.resource.iteration": notApplicable,
   "name.resource.iteration": notApplicable,
 
-  // Miscellaneous
-  "value.yield": notApplicable,
+  // Namespace
+  "name.namespace": notApplicable,
   "interior.namespace": notApplicable,
+
+  // Branch loop
   "branch.loop": notApplicable,
   "branch.loop.iteration": notApplicable,
+
+  // Miscellaneous
+  "value.yield": notApplicable,
   pairDelimiter: notApplicable,
   regularExpression: notApplicable,
   environment: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/javascript.ts b/packages/common/src/scopeSupportFacets/javascript.ts
@@ -208,13 +208,18 @@ export const javascriptCoreScopeSupport: LanguageScopeSupportFacetMap = {
   "functionName.iteration.block": notApplicable,
   "namedFunction.iteration.block": notApplicable,
 
+  // Namespace
+  "name.namespace": notApplicable,
+  "interior.namespace": notApplicable,
+
+  // Branch loop
+  "branch.loop": notApplicable,
+  "branch.loop.iteration": notApplicable,
+
   // Miscellaneous
   environment: notApplicable,
   selector: notApplicable,
   unit: notApplicable,
-  "interior.namespace": notApplicable,
-  "branch.loop": notApplicable,
-  "branch.loop.iteration": notApplicable,
 };
 
 export const javascriptJsxScopeSupport: LanguageScopeSupportFacetMap = {
diff --git a/packages/common/src/scopeSupportFacets/json.ts b/packages/common/src/scopeSupportFacets/json.ts
@@ -135,6 +135,7 @@ export const jsonScopeSupport: LanguageScopeSupportFacetMap = {
   "name.assignment": notApplicable,
   "name.assignment.pattern": notApplicable,
   "name.class": notApplicable,
+  "name.namespace": notApplicable,
   "name.constructor": notApplicable,
   "name.field": notApplicable,
   "name.foreach": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/markdown.ts b/packages/common/src/scopeSupportFacets/markdown.ts
@@ -133,6 +133,7 @@ export const markdownScopeSupport: LanguageScopeSupportFacetMap = {
   "name.assignment": notApplicable,
   "name.assignment.pattern": notApplicable,
   "name.class": notApplicable,
+  "name.namespace": notApplicable,
   "name.constructor": notApplicable,
   "name.field": notApplicable,
   "name.foreach": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/python.ts b/packages/common/src/scopeSupportFacets/python.ts
@@ -183,48 +183,71 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   pairDelimiter: supported,
   fieldAccess: supported,
 
-  // Not applicable
+  /* NOT APPLICABLE */
 
-  "argumentList.formal.lambda.multiLine": notApplicable,
+  // Element and tags
+  element: notApplicable,
+  tags: notApplicable,
+  startTag: notApplicable,
+  endTag: notApplicable,
+  "interior.element": notApplicable,
+  "textFragment.element": notApplicable,
+  attribute: notApplicable,
+  "key.attribute": notApplicable,
+  "value.attribute": notApplicable,
+
+  // Section
+  section: notApplicable,
+  "section.iteration.document": notApplicable,
+  "section.iteration.parent": notApplicable,
+
+  // Command
+  command: notApplicable,
+  "interior.command": notApplicable,
+
+  // Namespace
+  "name.namespace": notApplicable,
+  "interior.namespace": notApplicable,
+
+  // Nested classes
   "class.iteration.block": notApplicable,
   "className.iteration.block": notApplicable,
-  "comment.block": notApplicable,
+
+  // for and do-while loops
   "condition.doWhile": notApplicable,
   "condition.for": notApplicable,
-  "functionName.iteration.block": notApplicable,
-  "interior.cell": notApplicable,
-  "interior.command": notApplicable,
-  "interior.element": notApplicable,
-  "interior.lambda.block": notApplicable,
   "interior.for": notApplicable,
   "interior.doWhile": notApplicable,
-  "interior.static": notApplicable,
-  "interior.namespace": notApplicable,
-  "key.attribute": notApplicable,
+
+  // Nested functions. Technically supported, but great problem with `every funk` in a method.
+  "functionName.iteration.block": notApplicable,
   "namedFunction.iteration.block": notApplicable,
-  "section.iteration.document": notApplicable,
-  "section.iteration.parent": notApplicable,
-  "textFragment.comment.block": notApplicable,
-  "textFragment.element": notApplicable,
+
+  // Type. Python have some types, but not these.
   "type.alias": notApplicable,
   "type.cast": notApplicable,
   "type.enum": notApplicable,
   "type.foreach": notApplicable,
   "type.interface": notApplicable,
   "type.resource.iteration": notApplicable,
   "type.resource": notApplicable,
-  "value.attribute": notApplicable,
   "value.typeAlias": notApplicable,
-  attribute: notApplicable,
-  command: notApplicable,
-  element: notApplicable,
-  endTag: notApplicable,
-  environment: notApplicable,
+
+  // Notebook cell
   notebookCell: notApplicable,
+  "interior.cell": notApplicable,
+
+  // Multiline lambda
+  "argumentList.formal.lambda.multiLine": notApplicable,
+  "interior.lambda.block": notApplicable,
+
+  // Block comments
+  "comment.block": notApplicable,
+  "textFragment.comment.block": notApplicable,
+
+  "interior.static": notApplicable,
+  environment: notApplicable,
   regularExpression: notApplicable,
-  section: notApplicable,
-  startTag: notApplicable,
-  tags: notApplicable,
   selector: notApplicable,
   unit: notApplicable,
 };
diff --git a/packages/common/src/scopeSupportFacets/scm.ts b/packages/common/src/scopeSupportFacets/scm.ts
@@ -133,6 +133,7 @@ export const scmScopeSupport: LanguageScopeSupportFacetMap = {
   "name.assignment": notApplicable,
   "name.assignment.pattern": notApplicable,
   "name.class": notApplicable,
+  "name.namespace": notApplicable,
   "name.constructor": notApplicable,
   "name.field": notApplicable,
   "name.foreach": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts
@@ -573,6 +573,10 @@ export const scopeSupportFacetInfos: Record<
     description: "Name of a class",
     scopeType: "name",
   },
+  "name.namespace": {
+    description: "Name of a namespace",
+    scopeType: "name",
+  },
   "name.field": {
     description: "Name (LHS) of a field in a class / interface",
     scopeType: "name",
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts
@@ -142,6 +142,7 @@ export const scopeSupportFacets = [
   "name.method",
   "name.constructor",
   "name.class",
+  "name.namespace",
   "name.field",
   "name.resource",
   "name.resource.iteration",
diff --git a/packages/common/src/scopeSupportFacets/talon.ts b/packages/common/src/scopeSupportFacets/talon.ts
@@ -148,6 +148,7 @@ export const talonScopeSupport: LanguageScopeSupportFacetMap = {
   "name.argument.formal.method.iteration": notApplicable,
   "name.assignment.pattern": notApplicable,
   "name.class": notApplicable,
+  "name.namespace": notApplicable,
   "name.constructor": notApplicable,
   "name.foreach": notApplicable,
   "name.function": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/xml.ts b/packages/common/src/scopeSupportFacets/xml.ts
@@ -132,6 +132,7 @@ export const xmlScopeSupport: LanguageScopeSupportFacetMap = {
   "name.assignment": notApplicable,
   "name.assignment.pattern": notApplicable,
   "name.class": notApplicable,
+  "name.namespace": notApplicable,
   "name.constructor": notApplicable,
   "name.field": notApplicable,
   "name.foreach": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/yaml.ts b/packages/common/src/scopeSupportFacets/yaml.ts
diff --git a/packages/cursorless-org-docs/src/docs/contributing/MissingLanguageScopes.tsx b/packages/cursorless-org-docs/src/docs/contributing/MissingLanguageScopes.tsx
