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.

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

Jump to bottom

term: get_terminal_size() for js_node, term.clear() for all js backends #12189

Merged
merged 2 commits into from
Oct 15, 2021
Merged

term: get_terminal_size() for js_node, term.clear() for all js backends #12189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87ce446
js: Fix str method codegen for multi return type
playXE Oct 15, 2021
9633e94
term: term.get_terminal_size() for js_node works properly, term.clear…
playXE Oct 15, 2021
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
21 changes: 18 additions & 3 deletions vlib/term/term.js.v
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
module term

#const $tty = require('tty');
// get_terminal_size returns a number of colums and rows of terminal window.
pub fn get_terminal_size() (int, int) {
// TODO Find a way to get proper width & height of the terminal
// on a Javascript environment
return default_columns_size, default_rows_size
$if js_node {
colums := 0
rows := 0
#let sizes = $tty.WriteStream(1).getWindowSize();
#colums.val = sizes[0];
#rows.val = sizes[1];

return colums, rows
} $else {
return default_columns_size, default_rows_size
}
}

// clear clears current terminal screen.
pub fn clear() {
print('\x1b[2J')
print('\x1b[H')
}
10 changes: 5 additions & 5 deletions vlib/v/gen/js/auto_str_methods.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,24 +264,24 @@ fn (mut g JsGen) gen_str_for_multi_return(info ast.MultiReturn, styp string, str
arg_str_fn_name := g.get_str_fn(typ)

if should_use_indent_func(sym.kind) && !sym_has_str_method {
fn_builder.writeln('\tstrings__Builder_write_string(sb, ${arg_str_fn_name}(a.arg$i));')
fn_builder.writeln('\tstrings__Builder_write_string(sb, ${arg_str_fn_name}(a[$i]));')
} else if sym.kind in [.f32, .f64] {
if sym.kind == .f32 {
tmp_val := str_intp_g32('a.arg$i')
tmp_val := str_intp_g32('a[$i]')
fn_builder.writeln('\tstrings__Builder_write_string(sb, $tmp_val);')
} else {
tmp_val := str_intp_g64('a.arg$i')
tmp_val := str_intp_g64('a[$i]')
fn_builder.writeln('\tstrings__Builder_write_string(sb, $tmp_val);')
}
} else if sym.kind == .string {
tmp_str := str_intp_sq('a.arg$i')
tmp_str := str_intp_sq('a[$i]')
fn_builder.writeln('\tstrings__Builder_write_string(sb, $tmp_str);')
} else if sym.kind == .function {
fn_builder.writeln('\tstrings__Builder_write_string(sb, ${arg_str_fn_name}());')
} else {
deref, deref_label := deref_kind(str_method_expects_ptr, is_arg_ptr, typ)
fn_builder.writeln('\t\tstrings__Builder_write_string(sb, new string("$deref_label"));')
fn_builder.writeln('\tstrings__Builder_write_string(sb, ${arg_str_fn_name}( $deref a.arg$i));')
fn_builder.writeln('\tstrings__Builder_write_string(sb, ${arg_str_fn_name}( $deref a[$i]));')
}
if i != info.types.len - 1 {
fn_builder.writeln('\tstrings__Builder_write_string(sb, new string(", "));')
Expand Down