@effect/language-service 0.9.1 → 0.9.2

package/index.js

@@ -2892,10 +2892,9 @@ function collectSelfAndAncestorNodesInRange(node, textRange) {
   });
 }
 var getAncestorNodesInRange = fn("AST.getAncestorNodesInRange")(function* (sourceFile, textRange) {
-  const ts = yield* service(TypeScriptApi);
-  const precedingToken = ts.findPrecedingToken(textRange.pos, sourceFile);
-  if (!precedingToken) return empty();
-  return yield* collectSelfAndAncestorNodesInRange(precedingToken, textRange);
+  const nodeAtPosition = yield* option(findNodeAtPosition(sourceFile, textRange.pos));
+  if (isNone2(nodeAtPosition)) return empty();
+  return yield* collectSelfAndAncestorNodesInRange(nodeAtPosition.value, textRange);
 });
 var NodeNotFoundError = class extends TaggedError("@effect/language-service/NodeNotFoundError") {
 };
@@ -2911,13 +2910,6 @@ var findNodeAtPosition = fn("AST.findNodeAtPosition")(function* (sourceFile, pos
   if (!result) return yield* fail3(new NodeNotFoundError());
   return result;
 });
-var collectDescendantsAndAncestorsInRange = fn(
-  "AST.collectDescendantsAndAncestorsInRange"
-)(function* (sourceFile, textRange) {
-  const nodeAtPosition = yield* option(findNodeAtPosition(sourceFile, textRange.pos));
-  if (isNone2(nodeAtPosition)) return empty();
-  return yield* collectSelfAndAncestorNodesInRange(nodeAtPosition.value, textRange);
-});
 function toTextRange(positionOrRange) {
   return typeof positionOrRange === "number" ? { end: positionOrRange, pos: positionOrRange } : positionOrRange;
 }
@@ -3208,6 +3200,43 @@ var contextSelfInClasses = createCompletion({
   })
 });
 
+// src/completions/effectDataClasses.ts
+var effectDataClasses = createCompletion({
+  name: "effect/effectDataClasses",
+  apply: fn("effectDataClasses")(function* (sourceFile, position) {
+    const ts = yield* service(TypeScriptApi);
+    const maybeInfos = yield* parseDataForExtendsClassCompletion(sourceFile, position);
+    if (isNone2(maybeInfos)) return [];
+    const { accessedObject, className, replacementSpan } = maybeInfos.value;
+    const dataName = yield* option(
+      findImportedModuleIdentifierByPackageAndNameOrBarrel(
+        sourceFile,
+        "effect",
+        "Data"
+      )
+    );
+    const effectDataIdentifier = match2(dataName, {
+      onNone: () => "Data",
+      onSome: (_) => _.text
+    });
+    if (effectDataIdentifier !== accessedObject.text) return [];
+    const name = className.text;
+    return [{
+      name: `TaggedError("${name}")`,
+      kind: ts.ScriptElementKind.constElement,
+      insertText: `${effectDataIdentifier}.TaggedError("${name}")<{${"${0}"}}>{}`,
+      replacementSpan,
+      isSnippet: true
+    }, {
+      name: `TaggedClass("${name}")`,
+      kind: ts.ScriptElementKind.constElement,
+      insertText: `${effectDataIdentifier}.TaggedClass("${name}")<{${"${0}"}}>{}`,
+      replacementSpan,
+      isSnippet: true
+    }];
+  })
+});
+
 // src/completions/effectSchemaSelfInClasses.ts
 var effectSchemaSelfInClasses = createCompletion({
   name: "effect/effectSchemaSelfInClasses",
@@ -3289,7 +3318,12 @@ var effectSelfInClasses = createCompletion({
 });
 
 // src/completions.ts
-var completions = [effectSchemaSelfInClasses, effectSelfInClasses, contextSelfInClasses];
+var completions = [
+  effectSchemaSelfInClasses,
+  effectSelfInClasses,
+  contextSelfInClasses,
+  effectDataClasses
+];
 
 // src/utils/TypeCheckerApi.ts
 var TypeCheckerApi = Tag("TypeChecker");
@@ -4462,10 +4496,7 @@ var removeUnnecessaryEffectGen = createRefactor({
   name: "effect/removeUnnecessaryEffectGen",
   description: "Remove unnecessary Effect.gen",
   apply: (sourceFile, textRange) => gen2(function* () {
-    for (const nodeToReplace of yield* collectDescendantsAndAncestorsInRange(
-      sourceFile,
-      textRange
-    )) {
+    for (const nodeToReplace of yield* getAncestorNodesInRange(sourceFile, textRange)) {
       const maybeNode = yield* pipe(
         effectGen(nodeToReplace),
         flatMap4(({ body }) => returnYieldEffectBlock(body)),
@@ -4489,7 +4520,7 @@ var removeUnnecessaryEffectGen = createRefactor({
 // src/refactors/toggleLazyConst.ts
 var toggleLazyConst = createRefactor({
   name: "effect/toggleLazyConst",
-  description: "Toggle type annotation",
+  description: "Toggle lazy const",
   apply: (sourceFile, textRange) => gen2(function* () {
     const ts = yield* service(TypeScriptApi);
     const maybeNode = pipe(