Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiline comments updates #39

Merged
merged 3 commits into from
Mar 9, 2020
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 45 additions & 48 deletions autoload/search.vim
Original file line number Diff line number Diff line change
Expand Up @@ -39,47 +39,47 @@ let s:non_standard_ft_extensions_map = {
\}

let s:filetypes_comments_map = {
\"cpp": "//",
\"elisp": ";",
\"commonlisp": ";",
\"javascript": "//",
\"typescript": "//",
\"dart": "//",
\"haskell": "--",
\"lua": "--",
\"rust": "//",
\"julia": "#" ,
\"objc": "//",
\"csharp": "//",
\"java": "//",
\"clojure": ";" ,
\"coffeescript": "#" ,
\"faust": "//",
\"fortran": "!" ,
\"go": "//",
\"perl": "#" ,
\"php": "//",
\"python": "#" ,
\"matlab": "%" ,
\"r": "#" ,
\"racket": ";" ,
\"ruby": "#" ,
\"crystal": "#" ,
\"nim": "#" ,
\"nix": "#" ,
\"scala": "//",
\"scheme": ";" ,
\"shell": "#" ,
\"swift": "//",
\"elixir": "#" ,
\"erlang": "%" ,
\"tex": "%" ,
\"systemverilog": "//",
\"vhdl": "--",
\"scss": "//",
\"pascal": "//",
\"protobuf": "//",
\"zig": "//",
\"cpp": ["//"],
\"elisp": [";"],
\"commonlisp": [";"],
\"javascript": ["//"],
\"typescript": ["//"],
\"dart": ["//"],
\"haskell": ["--"],
\"lua": ["--"],
\"rust": ["//"],
\"julia": ["#"] ,
\"objc": ["//"],
\"csharp": ["//"],
\"java": ["//"],
\"clojure": [";"] ,
\"coffeescript": ["#"] ,
\"faust": ["//"],
\"fortran": ["!"] ,
\"go": ["//"],
\"perl": ["#"] ,
\"php": ["//", "#"],
\"python": ["#"] ,
\"matlab": ["%"] ,
\"r": ["#"] ,
\"racket": [";"] ,
\"ruby": ["#"] ,
\"crystal": ["#"] ,
\"nim": ["#"] ,
\"nix": ["#"] ,
\"scala": ["//"],
\"scheme": [";"] ,
\"shell": ["#"] ,
\"swift": ["//"],
\"elixir": ["#"] ,
\"erlang": ["%"] ,
\"tex": ["%"] ,
\"systemverilog": ["//"],
\"vhdl": ["--"],
\"scss": ["//"],
\"pascal": ["//"],
\"protobuf": ["//"],
\"zig": ["//"],
\}


Expand Down Expand Up @@ -374,14 +374,11 @@ fu! s:FilterGrepResults(language, grep_results) abort
endif

if g:any_jump_remove_comments_from_results && has_key(s:filetypes_comments_map, a:language)
let comment_pattern = s:filetypes_comments_map[a:language]
let comment_pattern = '^\s*' . comment_pattern
let comment_patterns = map(copy(s:filetypes_comments_map[a:language]), "'^\\s*' . v:val")
let filtered = copy(a:grep_results)

let filtered = []
for gr in a:grep_results
if match(gr.text, comment_pattern) == -1
call add(filtered, gr)
endif
for comment_pattern in comment_patterns
call filter(filtered, 'v:val.text !~# comment_pattern')
endfor

return filtered
Expand Down