vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

fmt: always use import() syntax

pull/4410/head
Alexander Medvednikov 2020-04-14 18:24:19 +02:00
parent ec10831318
commit 211275ab49
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vlib/v/fmt/fmt.v
View File

@ -98,28 +98,28 @@ fn (f mut Fmt) mod(mod ast.Module) {
} }
fn (f mut Fmt) imports(imports []ast.Import) { fn (f mut Fmt) imports(imports []ast.Import) {
if f.did_imports { if f.did_imports || imports.len == 0 {
return return
} }
f.did_imports = true
// f.import_pos = f.out.len // f.import_pos = f.out.len
f.did_imports = true
/*
if imports.len == 1 { if imports.len == 1 {
imp_stmt_str := f.imp_stmt_str(imports[0]) imp_stmt_str := f.imp_stmt_str(imports[0])
f.out_imports.writeln('import ${imp_stmt_str}\n') f.out_imports.writeln('import ${imp_stmt_str}\n')
} else if imports.len > 1 { } else if imports.len > 1 {
f.out_imports.writeln('import (') */
// f.indent++ f.out_imports.writeln('import (')
for imp in imports { for imp in imports {
if !(imp.mod in f.used_imports) { if !(imp.mod in f.used_imports) {
// TODO bring back once only unused imports are removed // TODO bring back once only unused imports are removed
// continue // continue
}
f.out_imports.write('\t')
f.out_imports.writeln(f.imp_stmt_str(imp))
} }
// f.indent-- f.out_imports.write('\t')
f.out_imports.writeln(')\n') f.out_imports.writeln(f.imp_stmt_str(imp))
} }
f.out_imports.writeln(')\n')
// }
} }
fn (f Fmt) imp_stmt_str(imp ast.Import) string { fn (f Fmt) imp_stmt_str(imp ast.Import) string {
@ -555,7 +555,7 @@ fn (f mut Fmt) expr(node ast.Expr) {
ast.MapInit { ast.MapInit {
if it.keys.len == 0 { if it.keys.len == 0 {
if it.value_type == 0 { if it.value_type == 0 {
f.write('map[string]int') // TODO f.write('map[string]int') // TODO
return return
} }
f.write('map[string]') f.write('map[string]')

4
vlib/v/fmt/tests/import_single_expected.vv
View File

@ -1,4 +1,6 @@
import os import (
os
)
fn main() { fn main() {
} }

4
vlib/v/fmt/tests/missing_import_expected.vv
View File

@ -1,4 +1,6 @@
import time import (
time
)
fn main() { fn main() {
println(time.now()) println(time.now())