aboutsummaryrefslogtreecommitdiff
path: root/editors
Commit message (Collapse)AuthorAgeFilesLines
* Formalize JoinLines protocol extensionAleksey Kladov2020-05-212-6/+10
|
* Merge #4552bors[bot]2020-05-214-31/+53
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4552: Transition OnEnter to WorkspaceSnippetEdit r=matklad a=matklad This also changes our handiling of snippet edits on the client side. `editor.insertSnippet` unfortunately forces indentation, which we really don't want to have to deal with. So, let's just implement our manual hacky way of dealing with a simple subset of snippets we actually use in rust-analyzer bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Transition OnEnter to WorkspaceSnippetEditAleksey Kladov2020-05-214-31/+53
| | | | | | | | | | | | | | | | This also changes our handiling of snippet edits on the client side. `editor.insertSnippet` unfortunately forces indentation, which we really don't want to have to deal with. So, let's just implement our manual hacky way of dealing with a simple subset of snippets we actually use in rust-analyzer
* | Fix phrasing in inlay hints settingsLaurențiu Nicola2020-05-211-4/+4
|/
* Debug lens fix for a binary.vsrs2020-05-201-4/+8
|
* Fix client-side snippetsAleksey Kladov2020-05-191-1/+2
|
* Implement client-side of SnippetTextEditAleksey Kladov2020-05-193-2/+81
|
* Add snippetTextEdit protocol extensionAleksey Kladov2020-05-191-4/+15
|
* Merge #4499bors[bot]2020-05-183-3/+47
|\ | | | | | | | | | | | | | | | | | | 4499: CodeLens configuration options r=vsrs a=vsrs This PR - adds an option to granularly enable\disable all CodeLens, just like the TypeScript extension. - fixes a minor bug for doctests. It makes no sense to show `Debug` lens for them as cargo `Can't skip running doc tests with --no-run`. Co-authored-by: vsrs <[email protected]>
| * Add "rust-analyzer.lens.enable"vsrs2020-05-182-3/+10
| |
| * code formattingvsrs2020-05-171-1/+1
| |
| * Runnable QuickPick with debuggees onlyvsrs2020-05-171-3/+14
| |
| * CodeLens configuration options.vsrs2020-05-172-0/+26
| |
* | Relax VS Code version requirementAleksey Kladov2020-05-171-2/+2
|/
* Color macros (fixes #4462)George Fraser2020-05-161-0/+3
|
* Merge #4448bors[bot]2020-05-156-100/+254
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4448: Generate configuration for launch.json r=vsrs a=vsrs This PR adds two new commands: `"rust-analyzer.debug"` and `"rust-analyzer.newDebugConfig"`. The former is a supplement to the existing `"rust-analyzer.run"` command and works the same way: asks for a runnable and starts new debug session. The latter allows adding a new configuration to **launch.json** (or to update an existing one). If the new option `"rust-analyzer.debug.useLaunchJson"` is set to true then `"rust-analyzer.debug"` and Debug Lens will first look for existing debug configuration in **launch.json**. That is, it has become possible to specify startup arguments, env variables, etc. `"rust-analyzer.debug.useLaunchJson"` is false by default, but it might be worth making true the default value. Personally I prefer true, but I'm not sure if it is good for all value. ---- I think that this PR also solves https://github.com/rust-analyzer/rust-analyzer/issues/3441. Both methods to update launch.json mentioned in the issue do not work: 1. Menu. It is only possible to add a launch.json configuration template via a debug adapter. And anyway it's only a template and it is impossible to specify arguments from an extension. 2. DebugConfigurationProvider. The exact opposite situation: it is possible to specify all debug session settings, but it is impossible to export these settings to launch.json. Separate `"rust-analyzer.newDebugConfig"` command looks better for me. ---- Fixes #4450 Fixes #3441 Co-authored-by: vsrs <[email protected]> Co-authored-by: vsrs <[email protected]>
| * Fix occasional test run during debug configurationvsrs2020-05-151-1/+5
| |
| * Fix runnable naming in the client side fallback.vsrs2020-05-141-1/+1
| |
| * Multiple binaries support for launch.json.vsrs2020-05-141-2/+3
| | | | | | | | Generate unique names on the LSP side.
| * Mixed "bin" and "test" artifacts workaround.vsrs2020-05-141-2/+7
| |
| * Multiple binaries support for launch.json.vsrs2020-05-141-0/+5
| |
| * Fix "rust-analyzer.debug" for QuickPick binaries.vsrs2020-05-141-0/+4
| |
| * Runnable quick pick with buttonsvsrs2020-05-141-21/+61
| |
| * Remove "rust-analyzer.debug.useLaunchJson" optionvsrs2020-05-143-19/+10
| |
| * Use launch.json in Debug Lens sessions.vsrs2020-05-133-2/+25
| | | | | | | | Add the possibility to use existing configurations via Debug Lens
| * DebugConfiguration simplification.vsrs2020-05-111-1/+11
| | | | | | | | ${workspaceRoot} substitution in generated DebugConfiguration.
| * "rust-analyzer.newDebugConfig" commandvsrs2020-05-114-3/+36
| |
| * "rust-analyzer.debug" commandvsrs2020-05-114-106/+144
| |
* | Make some stuff public so that they can be reused by other toolsPavan Kumar Sunkara2020-05-141-1/+1
| |
* | Merge #4400bors[bot]2020-05-131-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4400: Enhanced coloring r=georgewfraser a=georgewfraser This PR builds on #4397 to enhance the existing syntax coloring. ## Underline mutable variables The textmate scope `markup.underline` underlines identifiers, which is a nice way to make mutable vars stand out: <img width="327" alt="Screen Shot 2020-05-09 at 1 18 55 PM" src="https://user-images.githubusercontent.com/1369240/81484179-8bb47d80-91f8-11ea-997d-1dcffbe44aa7.png"> ## Italicize static variables The textmate scope `markup.italic` italicizes identifiers. Italic = static is a common convention in IDEs like IntelliJ: <img width="288" alt="Screen Shot 2020-05-09 at 1 19 14 PM" src="https://user-images.githubusercontent.com/1369240/81484236-cd452880-91f8-11ea-8478-505ee49bc8b3.png"> Co-authored-by: George Fraser <[email protected]>
| * | Leave statics aloneGeorge Fraser2020-05-121-3/+0
| | |
| * | Mark up statics and mutablesGeorge Fraser2020-05-121-0/+6
| | |
* | | Merge #4440bors[bot]2020-05-132-51/+59
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4440: Update packages r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| * | | Bump packageskjeremy2020-05-132-50/+58
| | | |
| * | | vscode engine 1.45kjeremy2020-05-121-1/+1
| |/ / | | | | | | | | | latest stable
* | | Merge #4083bors[bot]2020-05-131-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4083: Smol documentation for ast nodes r=matklad a=Veetaha There is a tremendous amount of TODOs to clarify the topics I am not certain about. Please @matklad, @edwin0cheng review carefully, I even left some mentions of your names in todos to put your attention where you most probably can give comments. In order to simplify the review, I separated the codegen (i.e. changes in `ast/generated/nodes.rs`) from `ast_src` changes (they in fact just duplicate one another) into two commits. Also, I had to hack a little bit to let the docs be generated as doc comments and not as doc attributes because it's easier to read them this way and IIRC we don't support hints for `#[doc = ""]` attributes for now... Closes #3682 Co-authored-by: veetaha <[email protected]>
| * | Fix "show syntax tree" commandveetaha2020-05-101-1/+1
| | | | | | | | | | | | @matlkad please don't forget to keep it up-to-date!
* | | Use .rust suffix on scopesGeorge Fraser2020-05-122-10/+10
| | |
* | | Put sigil back to keyword.operatorGeorge Fraser2020-05-101-2/+2
| | |
* | | Change lifetimes back to keyword-ish, tweak builtins for consistency between ↵George Fraser2020-05-102-7/+10
| | | | | | | | | | | | TextMate and semantic
* | | Color `as` as a keywordGeorge Fraser2020-05-101-2/+2
| | |
* | | No longer trueGeorge Fraser2020-05-101-6/+0
| | |
* | | Color core types as types, not keywordsGeorge Fraser2020-05-101-5/+5
| | |
* | | Color sigil like keywordGeorge Fraser2020-05-101-1/+1
| | |
* | | Color lifetimes like typesGeorge Fraser2020-05-101-12/+4
| | |
* | | Import built-in textmate grammar, with no changesGeorge Fraser2020-05-103-0/+698
| | |
* | | Tweak the textmate fallback scopes to be consistent with builtin TextMate ↵George Fraser2020-05-101-8/+8
| |/ |/| | | | | grammar and other languages
* | Word fixEdwin Cheng2020-05-101-1/+1
|/
* Merge remote-tracking branch 'upstream/master' into uniformed_debug_lensvsrs2020-05-086-46/+85
|\ | | | | | | | | # Conflicts: # editors/code/src/commands/runnables.ts
| * Merge #4329bors[bot]2020-05-084-40/+67
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4329: Look for `cargo`, `rustc`, and `rustup` in standard installation path r=matklad a=cdisselkoen Discussed in #3118. This is approximately a 90% fix for the issue described there. This PR creates a new crate `ra_env` with a function `get_path_for_executable()`; see docs there. `get_path_for_executable()` improves and generalizes the function `cargo_binary()` which was previously duplicated in the `ra_project_model` and `ra_flycheck` crates. (Both of those crates now depend on the new `ra_env` crate.) The new function checks (e.g.) `$CARGO` and `$PATH`, but also falls back on `~/.cargo/bin` manually before erroring out. This should allow most users to not have to worry about setting the `$CARGO` or `$PATH` variables for VSCode, which can be difficult e.g. on macOS as discussed in #3118. I've attempted to replace all calls to `cargo`, `rustc`, and `rustup` in rust-analyzer with appropriate invocations of `get_path_for_executable()`; I don't think I've missed any in Rust code, but there is at least one invocation in TypeScript code which I haven't fixed. (I'm not sure whether it's affected by the same problem or not.) https://github.com/rust-analyzer/rust-analyzer/blob/a4778ddb7a00f552a8e653bbf56ae9fd69cfe1d3/editors/code/src/cargo.ts#L79 I'm sure this PR could be improved a bunch, so I'm happy to take feedback/suggestions on how to solve this problem better, or just bikeshedding variable/function/crate names etc. cc @Veetaha Fixes #3118. Co-authored-by: Craig Disselkoen <[email protected]> Co-authored-by: veetaha <[email protected]>