@effect/language-service 0.32.0 → 0.33.1

package/index.js

@@ -1519,17 +1519,34 @@ function parseDiagnosticSeverity(config) {
     )
   );
 }
+var defaults = {
+  refactors: true,
+  diagnostics: true,
+  diagnosticSeverity: {},
+  quickinfo: true,
+  quickinfoEffectParameters: "whentruncated",
+  completions: true,
+  goto: true,
+  inlays: true,
+  allowedDuplicatedPackages: [],
+  namespaceImportPackages: [],
+  barrelImportPackages: [],
+  topLevelNamedReexports: "ignore"
+};
 function parse(config) {
   return {
-    diagnostics: isObject(config) && hasProperty(config, "diagnostics") && isBoolean(config.diagnostics) ? config.diagnostics : true,
-    diagnosticSeverity: isObject(config) && hasProperty(config, "diagnosticSeverity") && isRecord(config.diagnosticSeverity) ? parseDiagnosticSeverity(config.diagnosticSeverity) : {},
-    quickinfo: isObject(config) && hasProperty(config, "quickinfo") && isBoolean(config.quickinfo) ? config.quickinfo : true,
-    completions: isObject(config) && hasProperty(config, "completions") && isBoolean(config.completions) ? config.completions : true,
-    goto: isObject(config) && hasProperty(config, "goto") && isBoolean(config.goto) ? config.goto : true,
-    allowedDuplicatedPackages: isObject(config) && hasProperty(config, "allowedDuplicatedPackages") && isArray(config.allowedDuplicatedPackages) && config.allowedDuplicatedPackages.every(isString) ? config.allowedDuplicatedPackages.map((_) => _.toLowerCase()) : [],
-    namespaceImportPackages: isObject(config) && hasProperty(config, "namespaceImportPackages") && isArray(config.namespaceImportPackages) && config.namespaceImportPackages.every(isString) ? config.namespaceImportPackages.map((_) => _.toLowerCase()) : [],
-    barrelImportPackages: isObject(config) && hasProperty(config, "barrelImportPackages") && isArray(config.barrelImportPackages) && config.barrelImportPackages.every(isString) ? config.barrelImportPackages.map((_) => _.toLowerCase()) : [],
-    topLevelNamedReexports: isObject(config) && hasProperty(config, "topLevelNamedReexports") && isString(config.topLevelNamedReexports) && (config.topLevelNamedReexports.toLowerCase() === "ignore" || config.topLevelNamedReexports.toLowerCase() === "follow") ? config.topLevelNamedReexports.toLowerCase() : "ignore"
+    refactors: isObject(config) && hasProperty(config, "refactors") && isBoolean(config.refactors) ? config.refactors : defaults.refactors,
+    diagnostics: isObject(config) && hasProperty(config, "diagnostics") && isBoolean(config.diagnostics) ? config.diagnostics : defaults.diagnostics,
+    diagnosticSeverity: isObject(config) && hasProperty(config, "diagnosticSeverity") && isRecord(config.diagnosticSeverity) ? parseDiagnosticSeverity(config.diagnosticSeverity) : defaults.diagnosticSeverity,
+    quickinfo: isObject(config) && hasProperty(config, "quickinfo") && isBoolean(config.quickinfo) ? config.quickinfo : defaults.quickinfo,
+    quickinfoEffectParameters: isObject(config) && hasProperty(config, "quickinfoEffectParameters") && isString(config.quickinfoEffectParameters) && ["always", "never", "whentruncated"].includes(config.quickinfoEffectParameters.toLowerCase()) ? config.quickinfoEffectParameters.toLowerCase() : defaults.quickinfoEffectParameters,
+    completions: isObject(config) && hasProperty(config, "completions") && isBoolean(config.completions) ? config.completions : defaults.completions,
+    goto: isObject(config) && hasProperty(config, "goto") && isBoolean(config.goto) ? config.goto : defaults.goto,
+    inlays: isObject(config) && hasProperty(config, "inlays") && isBoolean(config.inlays) ? config.inlays : defaults.inlays,
+    allowedDuplicatedPackages: isObject(config) && hasProperty(config, "allowedDuplicatedPackages") && isArray(config.allowedDuplicatedPackages) && config.allowedDuplicatedPackages.every(isString) ? config.allowedDuplicatedPackages.map((_) => _.toLowerCase()) : defaults.allowedDuplicatedPackages,
+    namespaceImportPackages: isObject(config) && hasProperty(config, "namespaceImportPackages") && isArray(config.namespaceImportPackages) && config.namespaceImportPackages.every(isString) ? config.namespaceImportPackages.map((_) => _.toLowerCase()) : defaults.namespaceImportPackages,
+    barrelImportPackages: isObject(config) && hasProperty(config, "barrelImportPackages") && isArray(config.barrelImportPackages) && config.barrelImportPackages.every(isString) ? config.barrelImportPackages.map((_) => _.toLowerCase()) : defaults.barrelImportPackages,
+    topLevelNamedReexports: isObject(config) && hasProperty(config, "topLevelNamedReexports") && isString(config.topLevelNamedReexports) && ["ignore", "follow"].includes(config.topLevelNamedReexports.toLowerCase()) ? config.topLevelNamedReexports.toLowerCase() : defaults.topLevelNamedReexports
   };
 }
 
@@ -5929,6 +5946,44 @@ function goto(applicableGotoDefinition, sourceFile, position) {
   return effectRpcDefinition(applicableGotoDefinition, sourceFile, position);
 }
 
+// src/inlays/middlewareGenLike.ts
+var middlewareGenLike = fn("middlewareGenLike")(function* (sourceFile, _span, preferences, inlayHints) {
+  if (!preferences) return inlayHints;
+  if (preferences.includeInlayFunctionLikeReturnTypeHints !== true) return inlayHints;
+  if (!inlayHints) return inlayHints;
+  const tsUtils = yield* service(TypeScriptUtils);
+  const ts = yield* service(TypeScriptApi);
+  const typeParser = yield* service(TypeParser);
+  const result = [];
+  const parseType = (node) => {
+    return pipe(
+      typeParser.effectGen(node),
+      orElse2(() => pipe(typeParser.effectFnGen(node), orElse2(() => typeParser.effectFnUntracedGen(node))))
+    );
+  };
+  for (const inlayHint of inlayHints) {
+    let shouldOmit = false;
+    if (inlayHint.kind === ts.InlayHintKind.Type) {
+      const node = tsUtils.findNodeAtPositionIncludingTrivia(sourceFile, inlayHint.position - 1);
+      if (node && node.parent) {
+        const possiblyGen = node.parent;
+        yield* pipe(
+          parseType(possiblyGen),
+          map3((_) => {
+            const argsCloseParen = ts.findChildOfKind(_.generatorFunction, ts.SyntaxKind.CloseParenToken, sourceFile);
+            if (argsCloseParen && _.body && inlayHint.position >= argsCloseParen.getEnd() && inlayHint.position <= _.body.getStart(sourceFile)) {
+              shouldOmit = true;
+            }
+          }),
+          ignore
+        );
+      }
+    }
+    if (!shouldOmit) result.push(inlayHint);
+  }
+  return result;
+});
+
 // src/quickinfo/dedupeJsDocs.ts
 var SymbolDisplayPartEq = make((fa, fb) => fa.kind === fb.kind && fa.text === fb.text);
 var JSDocTagInfoEq = make(
@@ -5952,6 +6007,8 @@ function effectTypeArgs(sourceFile, position, quickInfo2) {
       const ts = yield* service(TypeScriptApi);
       const typeChecker = yield* service(TypeCheckerApi);
       const typeParser = yield* service(TypeParser);
+      const options = yield* service(LanguageServicePluginOptions);
+      if (options.quickinfoEffectParameters === "never") return quickInfo2;
       function formatTypeForQuickInfo(channelType, channelName) {
         const stringRepresentation = typeChecker.typeToString(
           channelType,
@@ -5997,7 +6054,7 @@ function effectTypeArgs(sourceFile, position, quickInfo2) {
           type: typeChecker.getTypeAtLocation(adjustedNode),
           atLocation: adjustedNode,
           node: adjustedNode,
-          shouldTry: quickInfo2 && ts.displayPartsToString(quickInfo2.displayParts).indexOf("...") > -1
+          shouldTry: options.quickinfoEffectParameters === "always" && quickInfo2 ? true : quickInfo2 && ts.displayPartsToString(quickInfo2.displayParts).indexOf("...") > -1
         };
       }
       const data = getDataForQuickInfo();
@@ -12435,6 +12492,23 @@ var init = (modules) => {
       }
       return applicableDefinition;
     };
+    proxy.provideInlayHints = (fileName, span, preferences, ...args2) => {
+      const applicableInlayHints = languageService.provideInlayHints(fileName, span, preferences, ...args2);
+      if (languageServicePluginOptions.inlays) {
+        const program = languageService.getProgram();
+        if (program) {
+          const sourceFile = program.getSourceFile(fileName);
+          if (sourceFile) {
+            return pipe(
+              middlewareGenLike(sourceFile, span, preferences, applicableInlayHints),
+              runNano(program),
+              getOrElse(() => applicableInlayHints)
+            );
+          }
+        }
+      }
+      return applicableInlayHints;
+    };
     return proxy;
   }
   return { create, onConfigurationChanged };