Skip to content

Commit

Permalink
[cascading] from release/11.5 to release/11.6.0-rc (#2669)
Browse files Browse the repository at this point in the history
<!--
{"currentBranch":"release/11.5","targetBranch":"release/11.6.0-rc","bypassReviewers":false,"isConflicting":false}
-->

## Cascading from release/11.5 to release/11.6.0-rc





---

:heavy_exclamation_mark: The pull request is conflicting with the target
branch.
You can fix the issue locally with the following commands:

<details open>
  <summary>Using <b>gh CLI</b></summary>

  ```shell
  gh pr checkout 2669
  git pull --ff origin release/11.6.0-rc
  ```

  and update this Pull Request with

  ```shell
  gh pr push 2669
  ```
</details>

<details>
  <summary>Using <b>git</b> only</summary>

  ```shell
  git fetch origin
  git checkout origin/cascading/11.5.0-11.6.0-rc
  git pull --ff origin release/11.6.0-rc
  ```

  and update this Pull Request with

  ```shell
  git push origin HEAD:cascading/11.5.0-11.6.0-rc
  ```
</details>



---

<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
  • Loading branch information
matthieu-crouzet authored Jan 8, 2025
2 parents 8a4d639 + 1d3016b commit 611b5b9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion apps/vscode-extension/src/intellisense/configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export const configurationCompletionItemProvider = (options: { channel: OutputCh
return [];
}

const config = (await (await eslint)?.calculateConfigForFile(doc.fileName) || {}) as TSESLint.FlatConfig.Config;
const config = await (await eslint)?.calculateConfigForFile(doc.fileName) || {};
const configurationTags = getConfigurationTagsFromEslintConfig(config, match[0], fileText);

return getCompletionsItemsFromConfigurationTags(configurationTags);
Expand Down

0 comments on commit 611b5b9

Please sign in to comment.