Commit Graph
14 Commits
Author SHA1 Message Date
josh11bandJosh L c130fe8d51 Fix VSCode language extension configuration instructions (#4725)
The instructions did not match the example. The VSCode settings suggests
the example is the correct one.

Co-authored-by: Josh L <josh11b@users.noreply.github.com>
2024-12-20 07:16:35 +00:00
Jon Ross-Perkins e85125c3d7 Extension version bump and npm update for a release of #4527 (#4722) 2024-12-20 00:59:49 +00:00
Chandler CarruthandJon Ross-Perkins 13502b7c89 Replace #4505 with a different set of workarounds (#4527)
This restores the symlinks for the installation, but teaches the busybox
info search to look for a relative path to the busybox binary itself
before walking through symlinks. This let's it find the tree structure
when directly invoking `prefix_root/bin/carbon` or similar, either
inside of a Bazel rule or from the command line, and mirrors how we
expect the installed tree to look. This works even when Bazel resolves
the symlink target fully, and potentially to something nonsensical like
a CAS file.

In order to make a convenient Bazel target that can be used with `bazel
run //toolchain`, this adds an override to explicitly set the desired
argv[0] to use when selecting a mode for the busybox and a busybox
binary. Currently, the workaround uses an environment variable because
that required the least amount of plumbing, and seems a useful override
mechanism generally, but I'm open to other approaches.

This should allow a few things to work a bit more nicely:
- It should handle sibling symlinks like `clang++` to `clang` or
  `ld.lld` to `lld`, where that symlink in turn points at the busybox.
  We want to use *initial* `argv[0]` value to select the mode there.
- It avoids bouncing through Python (or other subprocesses) when
  invoking the `carbon` binary in Bazel rules, which will be nice for
  building the example code and benchmarking.

It does come at a cost of removing one feature: the initial symlink
can't be some unrelated alias like `my_carbon_symlink` -- we expect the
*first* argv[0] name to have the meaningful filename for selecting
a busybox mode.

It also trades the complexity of the Python script for some complexity
in the busybox search in order to look for a relative `carbon-busybox`
binary. On the whole, I think that tradeoff is worthwhile, but it isn't
free.

---------

Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
2024-12-20 00:33:29 +00:00
Jon Ross-Perkins f67a4a5bcb Do a pass on vscode development instructions (#4703) 2024-12-19 00:31:24 +00:00
Jon Ross-Perkins a651ce1961 Fix default for Carbon Path (#4705)
The extension.ts tries to provide a default, but it's not working the
way I expect. So in addition, provide it in properties, which seems to
work better.
2024-12-18 17:43:47 +00:00
Jon Ross-PerkinsandRichard Smith f922988c8c Update the vscode language server setup (#4663)
Switches from js to ts, and starts bundling files in order to produce a
better package for deployment. Fixes the README.md to be a more
appropriate front page, moving dev content to development.md. Makes the
path to `carbon` configurable so that it's more stable than just running
in `bazel-bin`.

This is built using suggestions from samples at
https://github.com/microsoft/vscode-extension-samples/tree/main/lsp-sample
and
https://github.com/microsoft/vscode-extension-samples/tree/main/esbuild-sample.
Note the esbuild in particular comes from complaints from `vsce` to use
an option from
https://code.visualstudio.com/api/working-with-extensions/bundling-extension,
and esbuild is just the first option detailed there (I have no real
opinion on options).

I'm bumping the version, and will do a release after merging.

---------

Co-authored-by: Richard Smith <richard@metafoo.co.uk>
2024-12-16 16:05:17 +00:00
Jon Ross-Perkins e98995c936 Update the vscode extension for publishing. (#4660)
A few initial fixes just so that publishing works.


https://marketplace.visualstudio.com/items?itemName=carbon-lang.carbon-vscode
2024-12-10 22:03:48 +00:00
Jon Ross-Perkins 145c44b66c Move the language server into toolchain's busybox. (#4469)
Removes the separate language server binary; I'm not sure we need to
provide it. Instead, `carbon language-server` is added as a subcommand.

Moves //language_server to //toolchain/language_server. Splits into a
trivial language_server.h, and a substantive server.h. I wasn't sure
about a better name, but wanted the split similar to check/check.h,
lex/lex.h, etc. At the same time, the class is probably going to be a
little big so not a good fit to through into just a cpp file.

This fixes some style issues with the language server class, but
generally I'm trying to not address things here in order to keep it
simpler.
2024-11-01 19:49:39 +00:00
Richard Smith f63a476751 Update vscode extension dependencies. (#4062) 2024-06-18 19:05:59 +00:00
dependabot[bot] afa265dd57 Bump the npm_and_yarn group across 1 directory with 2 updates (#4049)
Bumps the npm_and_yarn group with 1 update in the /utils/vscode
directory: [@azure/identity](https://github.com/Azure/azure-sdk-for-js).

Updates `@azure/identity` from 4.2.0 to 4.2.1
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/Azure/azure-sdk-for-js/commit/183d301977d00dfd701a0bb875d5beac709dc507"><code>183d301</code></a>
Upgrade to a version ESRP Release that supports federated auth (<a
href="https://redirect.github.com/Azure/azure-sdk-for-js/issues/29612">#29612</a>)</li>
<li><a
href="https://github.com/Azure/azure-sdk-for-js/commit/9a2afdf4fe037549527a5c83b6331218541f8f41"><code>9a2afdf</code></a>
[identity] Prep for release (<a
href="https://redirect.github.com/Azure/azure-sdk-for-js/issues/29981">#29981</a>)</li>
<li>See full diff in <a
href="https://github.com/Azure/azure-sdk-for-js/compare/@azure/identity_4.2.0...@azure/identity_4.2.1">compare
view</a></li>
</ul>
</details>
<br />

Updates `@azure/msal-node` from 2.9.1 to 2.9.2
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/AzureAD/microsoft-authentication-library-for-js/releases"><code>@​azure/msal-node</code>'s
releases</a>.</em></p>
<blockquote>
<h2><code>@​azure/msal-node</code> v2.9.2</h2>
<h2>2.9.2</h2>
<p>Mon, 10 Jun 2024 22:30:36 GMT</p>
<h3>Patches</h3>
<ul>
<li>Fixed msal-node unit tests for PoP token support #7119 (<a
href="mailto:lalimasharda@microsoft.com">lalimasharda@microsoft.com</a>)</li>
<li>Implementation Based on Feature Request <a
href="https://redirect.github.com/AzureAD/microsoft-authentication-library-for-js/issues/7151">#7151</a>
(<a
href="mailto:rginsburg@microsoft.com">rginsburg@microsoft.com</a>)</li>
<li>Bump <code>@​azure/msal-common</code> to v14.12.0 (beachball)</li>
<li>Bump eslint-config-msal to v0.0.0 (beachball)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/AzureAD/microsoft-authentication-library-for-js/commit/1b0fc2023be87c0eb2af7e6c52152eea289b9089"><code>1b0fc20</code></a>
Bump package versions</li>
<li><a
href="https://github.com/AzureAD/microsoft-authentication-library-for-js/commit/5685c8cff1f0334ad77268759ccf828c71db419b"><code>5685c8c</code></a>
Update lab request scope (<a
href="https://redirect.github.com/AzureAD/microsoft-authentication-library-for-js/issues/7155">#7155</a>)</li>
<li><a
href="https://github.com/AzureAD/microsoft-authentication-library-for-js/commit/25aefea3e9f4ee814a6e8ab597d91b6806eecba6"><code>25aefea</code></a>
Support pop as optional for full framed apps (<a
href="https://redirect.github.com/AzureAD/microsoft-authentication-library-for-js/issues/7119">#7119</a>)</li>
<li><a
href="https://github.com/AzureAD/microsoft-authentication-library-for-js/commit/7563498a9c0b6aee57957da3615434159d626c5f"><code>7563498</code></a>
Update package-lock (<a
href="https://redirect.github.com/AzureAD/microsoft-authentication-library-for-js/issues/7152">#7152</a>)</li>
<li><a
href="https://github.com/AzureAD/microsoft-authentication-library-for-js/commit/3893cce8de08594155125c3c1db140ec69a7da07"><code>3893cce</code></a>
Update gatsby and angular samples (<a
href="https://redirect.github.com/AzureAD/microsoft-authentication-library-for-js/issues/7150">#7150</a>)</li>
<li><a
href="https://github.com/AzureAD/microsoft-authentication-library-for-js/commit/3ee9c68d1a80bf7652e41b58ae1bf87ff64a727e"><code>3ee9c68</code></a>
Implementation Based on Feature Request (<a
href="https://redirect.github.com/AzureAD/microsoft-authentication-library-for-js/issues/7151">#7151</a>)</li>
<li><a
href="https://github.com/AzureAD/microsoft-authentication-library-for-js/commit/cc18b42d4ffaf80b72262d0efee2d157ab9f7a1c"><code>cc18b42</code></a>
Remove outdated TS Sample (<a
href="https://redirect.github.com/AzureAD/microsoft-authentication-library-for-js/issues/7149">#7149</a>)</li>
<li>See full diff in <a
href="https://github.com/AzureAD/microsoft-authentication-library-for-js/compare/msal-node-v2.9.1...msal-node-v2.9.2">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore <dependency name> major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will
remove the ignore condition of the specified dependency and ignore
conditions
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/carbon-language/carbon-lang/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-12 22:23:54 +00:00
Richard Smith 202aae453f Get the VS Code extension working again. (#4037)
VSCode's JSON parser no longer accepts comments in at least textmate
grammars, so remove the comments. It's unclear whether VSCode changed
here or whether this hasn't worked since the comments were added.

Clean up the textmate grammar: refactor, add some missing operators and
keywords, classify keywords as introducer / modifier as appropriate, fix
comment grammar to require space after `//`, and generalize recognition
of iN, fN, uN to recognize all such type literals.

Be more cautious in language server -- I was seeing frequent crashes for
`IdentifierName` parse nodes whose token was not actually an identifier,
presumably due to error recovery.
2024-06-06 23:27:33 +00:00
5c5a687534 Syntax highlighter in VScode for carbon programming language (#3953)
I have made the necessary changes to
https://github.com/carbon-language/carbon-lang/tree/trunk/utils/vscode
for the VScode syntax highlighter to work:

- [x] Changes have been tested and found to be working.

---------

Co-authored-by: Richard Smith <richard@metafoo.co.uk>
Co-authored-by: Carbon Infra Bot <carbon-external-infra@google.com>
2024-05-21 00:42:14 +00:00
maan2003 7c891fdacd Language Server (#3112)
Add a language server for carbon as part of GSoC.

This currently does code outline using toolchain parser.

See development steps in utils/vscode/README.md for running and using
language server.
2023-08-21 18:39:31 +00:00
mx42 de614f37e9 Add basic VS Code extension using textmate syntax (#2969) 2023-07-19 03:30:41 +00:00