Improved the ctags impl regex. #15865
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -7,5 +7,5 @@ | |||
| --regex-Rust=/^[ \t]*(pub[ \t]+)?mod[ \t]+([a-zA-Z0-9_]+)/\2/m,modules,module names/ | |||
| --regex-Rust=/^[ \t]*(pub[ \t]+)?static[ \t]+([a-zA-Z0-9_]+)/\2/c,consts,static constants/ | |||
| --regex-Rust=/^[ \t]*(pub[ \t]+)?trait[ \t]+([a-zA-Z0-9_]+)/\2/t,traits,traits/ | |||
| --regex-Rust=/^[ \t]*(pub[ \t]+)?impl([ \t\n]+<.*>)?[ \t]+([a-zA-Z0-9_]+)/\3/i,impls,trait implementations/ | |||
| --regex-Rust=/^[ \t]*(pub[ \t]+)?impl([ \t\n]*<.*>)?[ \t]+(([a-zA-Z0-9_:]+[ \t])[ \t]*(for[ \t])[ \t]*)?([a-zA-Z0-9_:]+)/\4\5\6/i,impls,trait implementations/ | |||
There was a problem hiding this comment.
This is probably still wrong for something like impl Iterator<uint> for ..., right? (That is, I can't see handling of type parameters here.) Also, is the space-or-tab meant to be included in these capturing groups?
|
I've made some changes so now it should handle type parameters as well. Previously I did intent to capture the space or tab so that it would show up in the replacement, but it looks like I can just add the space in the replacements and ctags is smart enough to remove the unneeded spaces. |
bors
added a commit
that referenced
this pull request
Aug 6, 2014
Previously the implementation detection regex would detect `impl fmt::Show for MyStruct` as `fmt`. Now it will be detected as `fmt::Show for MyStruct`. Implementations such as `impl MyStruct` will still be detected as `MyStruct`.
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously the implementation detection regex would detect
impl fmt::Show for MyStructasfmt. Now it will be detected asfmt::Show for MyStruct. Implementations such asimpl MyStructwillstill be detected as
MyStruct.