Skip to content

Feature/CSH-66-file-directory-tab-completion-does-not-work-correc #22

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.

Sign up for GitHub

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

Closed
jeanbaptistelab wants to merge 1 commit into from
Closed

Feature/CSH-66-file-directory-tab-completion-does-not-work-correc #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 25 additions & 10 deletions src/completer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,21 @@ void slash_path_completer(struct slash * slash, char * token) {

/* skip flags in cmd */
char * orig_slash_buffer = slash->buffer;
slash_completer_skip_flagged_prefix(slash, NULL);

char *token_to_complete = NULL;
if (slash->cursor == slash->length) {
token_to_complete = slash->buffer + slash->length;
while(token_to_complete > slash->buffer && *(token_to_complete-1) != ' ') {
token_to_complete--;
}
} else {
size_t token_len = strlen(token);
size_t cursor_offset = slash->length - slash->cursor;
if (cursor_offset < token_len) {
token[token_len - cursor_offset] = '\0';
}
token_to_complete = token;
}

/* lazy fix */
/* TODO?: Not really sure what the line below is supposed to fix,
Expand All @@ -319,16 +333,16 @@ void slash_path_completer(struct slash * slash, char * token) {
// TODO: Add support for absolute paths
/* handle home shortcut (~) and subdirectories in token */
int subdir_idx;
if (token[0] == '~') {
if (token_to_complete[0] == '~') {
strcpy(cwd_buf, getenv("HOME"));
strcat(cwd_buf, &token[1]);
strcat(cwd_buf, &token_to_complete[1]);
subdir_idx = last_char_occ(cwd_buf, '/');
if (subdir_idx != -1) {
cwd_buf[subdir_idx] = '\0';
}
} else {
subdir_idx = last_char_occ(token, '/');
strcpy(cwd_buf, token);
subdir_idx = last_char_occ(token_to_complete, '/');
strcpy(cwd_buf, token_to_complete);
if (subdir_idx != -1) {
cwd_buf[subdir_idx] = '\0';
}
Expand Down Expand Up @@ -388,6 +402,7 @@ void slash_path_completer(struct slash * slash, char * token) {
switch (match_count)
{
case 0:
printf("\n");
ls_appended((subdir_idx > -1) ? cwd_buf : NULL, NULL);
slash_bell(slash);
break;
Expand All @@ -397,20 +412,20 @@ void slash_path_completer(struct slash * slash, char * token) {
cwd_buf[subdir_idx] = '/';
}
strcpy(cwd_buf+subdir_idx+1, match_list[0]);
strcpy(token, cwd_buf);
strcpy(token_to_complete, cwd_buf);
slash->length = strlen(cwd_buf);
slash->cursor = slash->length;
break;

default: {
int prefix_idx = common_prefix_idx(match_list, match_count);

strncpy(token+subdir_idx+1, match_list[0], prefix_idx);
token[subdir_idx+prefix_idx+1] = 0;
slash->length = (token - slash->buffer) + strlen(token);
strncpy(token_to_complete+subdir_idx+1, match_list[0], prefix_idx);
token_to_complete[subdir_idx+prefix_idx+1] = 0;
slash->length = (token_to_complete - slash->buffer) + strlen(token_to_complete);
slash->cursor = slash->length;
printf("\n");
ls_appended(token, "* -d");
ls_appended(token_to_complete, "* -d");
break;
}
}
Expand Down