@actions/languageserver 0.3.27 → 0.3.28

package/dist/cli.bundle.cjs

@@ -24455,13 +24455,13 @@ var DefinitionValueMode;
   DefinitionValueMode2[DefinitionValueMode2["Parent"] = 0] = "Parent";
   DefinitionValueMode2[DefinitionValueMode2["Key"] = 1] = "Key";
 })(DefinitionValueMode = DefinitionValueMode || (DefinitionValueMode = {}));
-function definitionValues(def, indentation, mode) {
+function definitionValues(def, indentation, mode, tokenStructure) {
   const schema2 = getWorkflowSchema();
   if (def instanceof MappingDefinition) {
     return mappingValues(def, schema2.definitions, indentation, mode);
   }
   if (def instanceof OneOfDefinition) {
-    return oneOfValues(def, schema2.definitions, indentation, mode);
+    return oneOfValues(def, schema2.definitions, indentation, mode, tokenStructure);
   }
   if (def instanceof BooleanDefinition) {
     return stringsToValues(["true", "false"]);
@@ -24540,10 +24540,20 @@ ${indentation}${key}: `;
   }
   return properties;
 }
-function oneOfValues(oneOfDefinition, definitions, indentation, mode) {
+function oneOfValues(oneOfDefinition, definitions, indentation, mode, tokenStructure) {
   const values = [];
   for (const key of oneOfDefinition.oneOf) {
-    values.push(...definitionValues(definitions[key], indentation, mode));
+    const variantDef = definitions[key];
+    if (!variantDef) {
+      continue;
+    }
+    if (tokenStructure) {
+      const variantBucket = getStructuralBucket(variantDef.definitionType);
+      if (variantBucket !== tokenStructure) {
+        continue;
+      }
+    }
+    values.push(...definitionValues(variantDef, indentation, mode, tokenStructure));
   }
   return distinctValues(values);
 }
@@ -24570,17 +24580,22 @@ function expandOneOfToCompletions(oneOfDef, definitions, key, description, inden
     sequence: false,
     mapping: false
   };
+  let scalarIsOnlyNull = true;
   for (const variantKey of oneOfDef.oneOf) {
     const variantDef = definitions[variantKey];
     if (variantDef) {
       const bucket = getStructuralBucket(variantDef.definitionType);
       buckets[bucket] = true;
+      if (bucket === "scalar" && !(variantDef instanceof NullDefinition)) {
+        scalarIsOnlyNull = false;
+      }
     }
   }
   const results = [];
   const bucketCount = [buckets.scalar, buckets.sequence, buckets.mapping].filter(Boolean).length;
   const needsQualifier = bucketCount > 1;
-  if (buckets.scalar) {
+  const skipNullOnlyScalar = mode === DefinitionValueMode.Key && scalarIsOnlyNull;
+  if (buckets.scalar && !skipNullOnlyScalar) {
     const insertText = mode === DefinitionValueMode.Key ? `
 ${indentation}${key}: ` : `${key}: `;
     results.push({
@@ -24715,9 +24730,35 @@ async function getValues(token, keyToken, parent, valueProviderConfig, workflowC
   if (!def) {
     return [];
   }
-  const values = definitionValues(def, indentation, keyToken ? DefinitionValueMode.Key : DefinitionValueMode.Parent);
+  const tokenStructure = getTokenStructure(token);
+  const values = definitionValues(def, indentation, keyToken ? DefinitionValueMode.Key : DefinitionValueMode.Parent, tokenStructure);
   return filterAndSortCompletionOptions(values, existingValues);
 }
+function getTokenStructure(token) {
+  if (!token) {
+    return void 0;
+  }
+  switch (token.templateTokenType) {
+    case TokenType2.Mapping:
+      return "mapping";
+    case TokenType2.Sequence:
+      return "sequence";
+    case TokenType2.Null:
+      return void 0;
+    case TokenType2.String: {
+      const stringToken = token.assertString("getTokenStructure expected string token");
+      if (stringToken.value === "") {
+        return void 0;
+      }
+      return "scalar";
+    }
+    case TokenType2.Boolean:
+    case TokenType2.Number:
+      return "scalar";
+    default:
+      return void 0;
+  }
+}
 function getExistingValues(token, parent) {
   if (token) {
     if (!isString(token)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/languageserver",
-  "version": "0.3.27",
+  "version": "0.3.28",
   "description": "Language server for GitHub Actions",
   "license": "MIT",
   "type": "module",
@@ -48,8 +48,8 @@
     "actions-languageserver": "./bin/actions-languageserver"
   },
   "dependencies": {
-    "@actions/languageservice": "^0.3.27",
-    "@actions/workflow-parser": "^0.3.27",
+    "@actions/languageservice": "^0.3.28",
+    "@actions/workflow-parser": "^0.3.28",
     "@octokit/rest": "^21.1.1",
     "@octokit/types": "^9.0.0",
     "vscode-languageserver": "^8.0.2",
@@ -78,5 +78,5 @@
     "ts-jest": "^29.0.3",
     "typescript": "^4.8.4"
   },
-  "gitHead": "86888cf4c8e058f83742597bb5e3cce4698742d8"
+  "gitHead": "a06ceee92b19cc7432ed25f63e8b4968b8ecb9ef"
 }