Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #15116 - Veykril:remove-markdown-injection, r=Veykril
Remove markdown injection again I really tried to make this work, but this stuff is so underdocumented and basically none of the regex options worked for me (not `match`, nor using `begin` and `end` pairs), VSCode basically doesn't help you out at all as it doesn't ever seem to report errors even when debugging an extension, so at this point I'm inclined to just remove this again, as it is only causing issues. Closes https://github.com/rust-lang/rust-analyzer/issues/15114 Closes https://github.com/rust-lang/rust-analyzer/issues/15111
bors 2023-06-23
parent 403433a · parent 0141a6b · commit 246d11b
-rw-r--r--editors/code/.vscodeignore1
-rw-r--r--editors/code/package.json10
-rw-r--r--editors/code/rustdoc.markdown.injection.tmGrammar.json23
3 files changed, 0 insertions, 34 deletions
diff --git a/editors/code/.vscodeignore b/editors/code/.vscodeignore
index 6e118f0b3a..09dc27056b 100644
--- a/editors/code/.vscodeignore
+++ b/editors/code/.vscodeignore
@@ -10,6 +10,5 @@
!package-lock.json
!package.json
!ra_syntax_tree.tmGrammar.json
-!rustdoc.markdown.injection.tmGrammar.json
!server
!README.md
diff --git a/editors/code/package.json b/editors/code/package.json
index 240ec1f836..a95689193d 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -1646,16 +1646,6 @@
"language": "ra_syntax_tree",
"scopeName": "source.ra_syntax_tree",
"path": "ra_syntax_tree.tmGrammar.json"
- },
- {
- "scopeName": "source.rustdoc.markdown.injection",
- "path": "rustdoc.markdown.injection.tmGrammar.json",
- "injectTo": [
- "source.rust"
- ],
- "embeddedLanguages": {
- "meta.embedded.block.markdown": "text.html.markdown"
- }
}
],
"problemMatchers": [
diff --git a/editors/code/rustdoc.markdown.injection.tmGrammar.json b/editors/code/rustdoc.markdown.injection.tmGrammar.json
deleted file mode 100644
index b12e62e1b6..0000000000
--- a/editors/code/rustdoc.markdown.injection.tmGrammar.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
- "scopeName": "source.rustdoc.markdown.injection",
- "injectionSelector": "L:source.rust",
- "patterns": [
- {
- "include": "#doc-comment-line"
- }
- ],
- "repository": {
- "doc-comment-line": {
- "name": "comment.line.documentation.rust",
- "begin": "^\\s*//(/|!)",
- "end": "$",
- "contentName": "meta.embedded.block.markdown",
- "patterns": [
- {
- "include": "text.html.markdown"
- }
- ]
- }
- }
-}