Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-14 17:07:44 +00:00
Code Issues Projects Releases Packages Wiki Activity
4184 commits 35 branches 80 tags 108 MiB
Commit graph

137 commits

Author SHA1 Message Date
ridiculousfish
0b7735d279 Merge pull request #1630 from kballard/expand_variables_in_quoted_strings 
Fix various expansions issues with variables
 2014-08-23 16:13:25 -07:00
Kevin Ballard
8aad53556d Highlight pipe characters correctly 
According to `fish_config`'s colors page, the pipe operator `|` is
supposed to be colored the same as a statement terminator.
 2014-08-22 11:45:05 -07:00
Kevin Ballard
9a90e041f3 Color "$foo[1" as an error 
We can't color the whole argument as an error, since the tokenizer is
responsible for that and doesn't care abou this case, but we can color
the `$foo[` bit as an error.
 2014-08-20 22:55:24 -07:00
Kevin Ballard
b0be15d4f7 Fix highlighting of "foo\"bar" 
The backslash-escape wasn't being properly caught by the highlighter.

Also remove the highlighting of `"\'"`, as `\'` is not a valid escape in
double-quotes, and add highlighting for a backslash-escaped newline.
 2014-08-20 22:34:18 -07:00
Kevin Ballard
a24998abac Highlight "$foo[1]" properly 
Preserve the highlighting applied to the slice brackets when coloring
variables inside of double-quoted strings.
 2014-08-20 22:28:42 -07:00
ridiculousfish
7ef9e4d8e7 Remove an unnecessary parse pass in highlight.cpp (oops) 2014-04-05 16:09:02 -07:00
ridiculousfish
0d3169ef70 Run restyle.sh to enforce style rules. 2014-03-31 10:01:39 -07:00
ridiculousfish
28fd1a4c5d Merge branch 'master' of github.com:fish-shell/fish-shell 2014-03-30 21:58:32 -07:00
ridiculousfish
d4fafeb6d6 Merge branch 'master' into 1218_rebase 
Conflicts:
	builtin.cpp
	builtin_commandline.cpp
	highlight.cpp
	input.cpp
	input.h
	reader.cpp
	screen.cpp
	screen.h
 2014-03-29 14:19:45 -07:00
ridiculousfish
7248b2213d Fix switch statement syntax highlighting so that the arguemnt to switch 
is colored as a parameter, not a command. Promote this from a tok_string
to a symbol_argument in the grammar too.
 2014-03-28 17:09:08 -07:00
ridiculousfish
005edf71a8 Fix initially backgrounded jobs. Fixes #1373 2014-03-28 14:39:47 -07:00
ridiculousfish
31bf50b2d4 Equip syntax highlighting with a variant that does no disk I/O. Invoke 
it after expanding an abbreviation, so that the expanded abbreviation
appears with (some) syntax highlighting.
 2014-03-26 18:49:09 -07:00
ridiculousfish
7a7fb423b3 Remove some unused function declarations 2014-03-26 10:00:32 -07:00
ridiculousfish
b520a03c57 Prefer swap() member function to std::swap. We were hitting the 
inefficient generic std::swap for some derived types.
 2014-03-25 12:44:21 -07:00
ridiculousfish
be33d3f2a4 Revert "Merge pull request #1317 from pullreq/cpp" 
This reverts commit 74135c0600, reversing
changes made to 6d749789ce.

See discussion in #1317
 2014-02-28 02:16:48 -08:00
Geoff Nixon
18dd6f58e3 Fixes .c -> .cpp in comments. For doxygen. 2014-02-27 06:23:40 -08:00
ridiculousfish
bc43409624 Expand the variable name as an ordinary parameter in for loops. Added 
test for it too.
 2014-02-21 18:20:51 -08:00
ridiculousfish
a57077aba3 Correctly color "end" command, and variable name in for loop. 2014-02-21 18:01:40 -08:00
ridiculousfish
1fbf633817 Reimplement exec parsing. Instead of special-casing exec as a command, 
promote it to a decoration (like 'command' or 'builtin'). This makes tab
completion and syntax highlighting treat exec's first argument as a
command and is otherwise a nice simplification. Fixes #1300
 2014-02-13 10:10:49 -08:00
ridiculousfish
bbd784a2e8 Clean up old syntax highlighting code now that the new parser seems to work 2014-02-09 21:21:59 -08:00
ridiculousfish
9b9ee338c1 Fix for miscoloring quote following variable name 2014-02-09 15:33:34 -08:00
ridiculousfish
bac3b39227 Highlight the entire variable name, not just the dollar sign. Fixes #1201 2014-02-03 14:16:00 -08:00
ridiculousfish
f58dff62c7 Beginnings of work for search field feature of new pager 2014-01-26 00:41:30 -08:00
ridiculousfish
7d3f808e4c Various tweaks and improvements to new pager, including disclosure 
feature
 2014-01-22 17:45:27 -08:00
Julian Aron Prenner
1157d330a6 Merge remote-tracking branch 'upstream/master' into bind_mode 2014-01-19 11:01:24 +01:00
ridiculousfish
64b1b5ca38 Merge branch 'master' into pager 2014-01-15 23:43:00 -08:00
ridiculousfish
8e77aca854 Fix for recent issue where random text might appear underlined. 2014-01-15 23:33:34 -08:00
Julian Aron Prenner
444cb894be Set selection color to purple 2014-01-15 22:41:10 +01:00
ridiculousfish
54689f6087 Merge branch 'master' into pager 
Conflicts:
	highlight.h
 2014-01-15 02:05:46 -08:00
ridiculousfish
53814983ff Update style and formatting to conform to fish style guide. 2014-01-15 01:40:40 -08:00
ridiculousfish
5953170f14 Update pager colors to use new non-bitmask architecture. 2014-01-15 01:36:09 -08:00
ridiculousfish
e2fe873049 Change highlight colors from a bitmask into a combination enum / bitmask 
so that we can support more than 16 color specifications.
 2014-01-15 01:01:25 -08:00
ridiculousfish
746cc4c10b Rename highlight_shell_magic to highlight_shell_new_parser 2014-01-13 00:31:25 -08:00
ridiculousfish
096f850433 Eliminate class parse_t 2014-01-12 22:39:12 -08:00
ridiculousfish
b6af3e51ab Very early work in adopting new parser for actual execution of commands. 
Not turned on yet.
 2013-12-23 14:53:56 -08:00
ridiculousfish
d5d9b9284a Initial work towards rewriting detect_errors to use new parser. 
Low-level tests currently pass; high level tests fail.
 2013-12-11 18:34:28 -08:00
ridiculousfish
34540babdb Merge branch 'master' into ast 
Conflicts:
	complete.cpp
	fish_tests.cpp
 2013-11-24 23:21:00 -08:00
ridiculousfish
9f6223311e Large cleanup and refactoring of unescape() function. 2013-11-24 22:58:39 -08:00
ridiculousfish
ce857b0770 Syntax highlighting for file redirections 2013-10-13 16:58:40 -07:00
ridiculousfish
ddf98661e4 Adopt new parser in tab completions 2013-10-12 18:17:03 -07:00
ridiculousfish
58447c147f Make the new parser LL(2). Support for correct handling of e.g. 'command 
--help'
 2013-10-09 20:37:07 -07:00
ridiculousfish
7b86b2e05a Adoption of new parser in abbreviations 2013-10-09 02:03:50 -07:00
ridiculousfish
54d7c29221 Syntax highlighting for command substitutions 2013-10-08 18:41:35 -07:00
ridiculousfish
c6eef16664 Autosuggestion adoption of new parser 2013-10-08 15:05:30 -07:00
ridiculousfish
4f718e83b3 Syntax highlighting now correctly handles cd 2013-10-07 03:56:09 -07:00
ridiculousfish
20ccda69f4 Command highlighting works 2013-10-07 01:04:37 -07:00
ridiculousfish
14741518a7 Command highlighting now works 2013-10-06 16:23:45 -07:00
ridiculousfish
dd91779442 Merge branch 'master' into ast_no_templates 
Conflicts:
	configure.ac
	exec.cpp
 2013-10-06 13:08:57 -07:00
ridiculousfish
e58b73179f More work on new parser 2013-08-11 00:35:00 -07:00
ridiculousfish
8e07e55c1f More work on new parser 2013-08-08 15:06:46 -07:00