rapydscript-ng 0.8.0 → 0.8.2

package/tools/fmt.mjs

@@ -27,6 +27,8 @@
 
 import fs from 'fs';
 import path from 'path';
+import { fileURLToPath } from 'url';
+import { read_pyproject_config } from './ini.mjs';
 
 // ---------------------------------------------------------------------------
 // Lexer
@@ -265,7 +267,6 @@ function is_operand(p) {
 function is_call_paren(p) {
     if (!p) return false;
     if (p.type === 'name' || p.type === 'string' || p.type === 'atom') return true;
-    if (p.value === 'def') return true;
     return p.value === ')' || p.value === ']' || p.value === '}';
 }
 
@@ -297,7 +298,7 @@ function separator(p, t, stack, prev_was_unary, sig_count, first_at) {
     if (pv === '@' && first_at && sig_count === 1) return false;  // decorator
     if (tv === '(' && is_call_paren(p)) return false;
     if (tv === '[' && is_index_bracket(p)) return false;
-    if ((tv === '=' || pv === '=') && top && top.kind === 'call') return false;  // kwarg / default
+    if ((tv === '=' || pv === '=') && top && top.kind === 'call' && !top.in_def_body) return false;  // kwarg / default
     if (prev_was_unary) return false;
     return true;
 }
@@ -350,6 +351,12 @@ function render(toks, honor_breaks, src_base, new_base, opts, initial_stack) {
     var out = '';
     var stack = initial_stack ? initial_stack.slice() : [];
     var prev_sig = null, prev_was_unary = false, sig_count = 0, first_at = false;
+    // after_def: true after seeing 'def' (and optionally a function name), so the
+    // next '(' can be identified as the def's parameter list.
+    // prev_closed_def_params: true when we just popped a def parameter list ')'.
+    // When the very next ':' is seen we mark the enclosing stack frame in_def_body
+    // so that '=' tokens inside the body are not suppressed as kwargs.
+    var after_def = false, prev_closed_def_params = false;
     for (var k = 0; k < toks.length; k++) {
         var t = toks[k];
         var did_break = false;
@@ -375,10 +382,43 @@ function render(toks, honor_breaks, src_base, new_base, opts, initial_stack) {
         out += token_text(t, opts);
         prev_was_unary = is_unary_here(prev_sig, t);
         if (t.type === 'punc') {
-            if (t.value === '(') stack.push({ kind: is_call_paren(prev_sig) ? 'call' : 'group' });
-            else if (t.value === '[') stack.push({ kind: is_index_bracket(prev_sig) ? 'index' : 'list' });
-            else if (t.value === '{') stack.push({ kind: 'dict' });
-            else if (t.value === ')' || t.value === ']' || t.value === '}') { if (stack.length) stack.pop(); }
+            if (t.value === '(') {
+                stack.push({ kind: is_call_paren(prev_sig) ? 'call' : 'group', is_def_params: after_def });
+                after_def = false; prev_closed_def_params = false;
+            } else if (t.value === '[') {
+                stack.push({ kind: is_index_bracket(prev_sig) ? 'index' : 'list' });
+                after_def = false; prev_closed_def_params = false;
+            } else if (t.value === '{') {
+                stack.push({ kind: 'dict' });
+                after_def = false; prev_closed_def_params = false;
+            } else if (t.value === ')' || t.value === ']' || t.value === '}') {
+                var popped = stack.length ? stack.pop() : null;
+                prev_closed_def_params = !!(popped && popped.is_def_params);
+                after_def = false;
+            } else if (t.value === ':') {
+                if (prev_closed_def_params && stack.length > 0) {
+                    // Only mark in_def_body for multi-line def bodies. For inline
+                    // defs (def():stmt; inside a call), the body is on the same
+                    // line and subsequent same-depth tokens are still kwargs.
+                    var next_is_newline = false;
+                    for (var nk = k + 1; nk < toks.length; nk++) {
+                        if (toks[nk].type === 'eof') break;
+                        if (toks[nk].type !== 'comment' && toks[nk].type !== 'shebang') {
+                            next_is_newline = toks[nk].nlb > 0; break;
+                        }
+                    }
+                    if (next_is_newline) stack[stack.length - 1].in_def_body = true;
+                }
+                prev_closed_def_params = false; after_def = false;
+            } else {
+                after_def = false; prev_closed_def_params = false;
+            }
+        } else if (t.type === 'keyword' && t.value === 'def') {
+            after_def = true; prev_closed_def_params = false;
+        } else if (after_def && t.type === 'name') {
+            prev_closed_def_params = false;  // named def: keep after_def for next '('
+        } else {
+            after_def = false; prev_closed_def_params = false;
         }
         if (sig_count === 0 && t.value === '@' && t.type === 'op') first_at = true;
         prev_sig = t; sig_count++;
@@ -578,6 +618,141 @@ function is_visual_def_start(elements, idx) {
     return true;
 }
 
+// ---------------------------------------------------------------------------
+// Import organization: __python__ group first, then stdlib group, then other group
+// ---------------------------------------------------------------------------
+
+// Stdlib module list is generated by self.mjs into dev/stdlib_modules.json by
+// reading src/lib/. Fall back to reading src/lib/ directly when the generated
+// file is absent (e.g. running straight from the release/ tree).
+var STDLIB_MODULES = (function () {
+    var em = globalThis.__rapydscript_embedded__;
+    if (em) {
+        if (em.stdlib_modules) return new Set(em.stdlib_modules);
+        if (em.stdlib) return new Set(Object.keys(em.stdlib)
+            .filter(function (n) { return n.slice(-4) === '.pyj'; })
+            .map(function (n) { return n.slice(0, -4); }));
+    }
+    try {
+        return new Set(JSON.parse(fs.readFileSync(
+            new URL('../dev/stdlib_modules.json', import.meta.url), 'utf-8')));
+    } catch (e) { /* generated file absent; fall through */ }
+    try {
+        return new Set(fs.readdirSync(fileURLToPath(new URL('../src/lib/', import.meta.url)))
+            .filter(function (n) { return n.slice(-4) === '.pyj'; })
+            .map(function (n) { return n.slice(0, -4); }));
+    } catch (e) { return new Set(); }
+}());
+
+function is_import_stmt(el) {
+    if (el.kind !== 'stmt') return false;
+    var sig = el.tokens.filter(function (t) { return t.type !== 'comment'; });
+    if (!sig.length) return false;
+    return sig[0].type === 'keyword' && (sig[0].value === 'import' || sig[0].value === 'from');
+}
+
+function is_python_builtin_import(el) {
+    var sig = el.tokens.filter(function (t) { return t.type !== 'comment'; });
+    if (sig.length < 3) return false;
+    return sig[0].type === 'keyword' && sig[0].value === 'from' &&
+           sig[1].type === 'name' && sig[1].value === '__python__' &&
+           sig[2].type === 'keyword' && sig[2].value === 'import';
+}
+
+function import_top_module(el) {
+    var sig = el.tokens.filter(function (t) { return t.type !== 'comment'; });
+    var i = 1;  // skip leading 'import' or 'from'
+    while (i < sig.length && sig[i].type === 'punc' && sig[i].value === '.') i++;  // skip relative dots
+    if (i < sig.length && sig[i].type === 'name') return sig[i].value;
+    return '';
+}
+
+// Returns a string sort key: '0\0<module>\0' for 'import X', '1\0<module>\0<names>' for 'from X import Y'.
+// This puts bare imports before from-imports (isort convention), then sorts alphabetically.
+function import_sort_key(el) {
+    var sig = el.tokens.filter(function (t) { return t.type !== 'comment'; });
+    if (!sig.length) return '2\0\0';
+    var is_from = sig[0].value === 'from';
+    var i = 1, dots = '', mod_parts = [];
+    while (i < sig.length && sig[i].type === 'punc' && sig[i].value === '.') { dots += '.'; i++; }
+    while (i < sig.length && !(sig[i].type === 'keyword' && sig[i].value === 'import')) {
+        if (sig[i].type === 'name') mod_parts.push(sig[i].value);
+        i++;
+    }
+    var mod = (dots + mod_parts.join('.')).toLowerCase();
+    if (!is_from) return '0\0' + mod + '\0';
+    i++;  // skip 'import' keyword
+    var names = [];
+    while (i < sig.length) { if (sig[i].type === 'name') names.push(sig[i].value.toLowerCase()); i++; }
+    return '1\0' + mod + '\0' + names.join(',');
+}
+
+function organize_import_elements(elements) {
+    // Identify the contiguous top-level import block: from the first level-0 import
+    // statement to the last, stopping at the first level-0 non-import statement.
+    var block_start = -1, block_end = -1;
+    for (var i = 0; i < elements.length; i++) {
+        var el = elements[i];
+        if (el.kind !== 'stmt' || el.level !== 0) continue;
+        if (is_import_stmt(el)) {
+            if (block_start < 0) block_start = i;
+            block_end = i;
+        } else {
+            if (block_start >= 0) break;
+        }
+    }
+    if (block_start < 0) return elements;
+
+    var block = elements.slice(block_start, block_end + 1);
+    var imports = [], leading_comments = [], seen_import = false;
+    for (var j = 0; j < block.length; j++) {
+        var bel = block[j];
+        if (bel.kind === 'stmt') { seen_import = true; imports.push(bel); }
+        else if (bel.kind === 'comment' && !seen_import) leading_comments.push(bel);
+        // Comments after the first import are dropped (import organizers conventionally do this).
+    }
+    if (!imports.length) return elements;
+
+    var python = [], stdlib = [], other = [];
+    for (var k = 0; k < imports.length; k++) {
+        if (is_python_builtin_import(imports[k])) python.push(imports[k]);
+        else if (STDLIB_MODULES.has(import_top_module(imports[k]))) stdlib.push(imports[k]);
+        else other.push(imports[k]);
+    }
+    function cmp(a, b) { var ka = import_sort_key(a), kb = import_sort_key(b); return ka < kb ? -1 : ka > kb ? 1 : 0; }
+    python.sort(cmp);
+    stdlib.sort(cmp);
+    other.sort(cmp);
+
+    var new_block = [], first_blank = block[0].blank_before || 0;
+    for (var lc = 0; lc < leading_comments.length; lc++) {
+        var cm = Object.assign({}, leading_comments[lc]);
+        if (lc === 0) cm.blank_before = first_blank;
+        new_block.push(cm);
+        first_blank = 0;
+    }
+    for (var p = 0; p < python.length; p++) {
+        var pi = Object.assign({}, python[p]);
+        pi.blank_before = (p === 0) ? first_blank : 0;
+        new_block.push(pi);
+        first_blank = 0;
+    }
+    var has_python = python.length > 0;
+    for (var s = 0; s < stdlib.length; s++) {
+        var si = Object.assign({}, stdlib[s]);
+        si.blank_before = (s === 0 && has_python) ? 1 : (s === 0 ? first_blank : 0);
+        new_block.push(si);
+        first_blank = 0;
+    }
+    var has_stdlib_or_python = stdlib.length > 0 || has_python;
+    for (var o = 0; o < other.length; o++) {
+        var oi = Object.assign({}, other[o]);
+        oi.blank_before = (o === 0 && has_stdlib_or_python) ? 1 : (o === 0 ? first_blank : 0);
+        new_block.push(oi);
+    }
+    return elements.slice(0, block_start).concat(new_block).concat(elements.slice(block_end + 1));
+}
+
 // ---------------------------------------------------------------------------
 // Element rendering + assembly
 // ---------------------------------------------------------------------------
@@ -589,9 +764,21 @@ function render_stmt(el, opts) {
     }
     var comment = null, code = el.tokens;
     if (code.length && code[code.length - 1].type === 'comment') { comment = code[code.length - 1]; code = code.slice(0, -1); }
+    var comment_str = comment ? '  ' + format_comment(comment.value) : '';
+    if (!opts.join_lines) {
+        // Preserve source line breaks unless a resulting line exceeds the limit,
+        // in which case fall through to the collapse+wrap path below.
+        var preserved = base_indent + render(code, true, el.indent, base_indent, opts);
+        var preserved_full = preserved + comment_str;
+        var plines = preserved_full.split('\n');
+        var fits = true;
+        for (var pi = 0; pi < plines.length; pi++) {
+            if (plines[pi].length > opts.line_length) { fits = false; break; }
+        }
+        if (fits) return preserved_full;
+    }
     var line = render(code, false, el.indent, base_indent, opts);
     var full = base_indent + line;
-    var comment_str = comment ? '  ' + format_comment(comment.value) : '';
     if ((full.length + comment_str.length) > opts.line_length && el.wrappable) {
         var wrapped = wrap_line(code, el.level, opts);
         if (wrapped !== null) return comment_str ? wrapped + comment_str : wrapped;
@@ -599,13 +786,7 @@ function render_stmt(el, opts) {
     return full + comment_str;
 }
 
-export function format_string(src, options) {
-    var opts = normalize_opts(options);
-    var text = src.replace(/\r\n?/g, '\n');
-    var toks = lex(text);
-    var elements = group(toks);
-    compute_levels(elements);
-
+function render_elements(elements, opts) {
     var result = '';
     for (var idx = 0; idx < elements.length; idx++) {
         var el = elements[idx];
@@ -630,6 +811,26 @@ export function format_string(src, options) {
     return result + '\n';
 }
 
+export function format_string(src, options) {
+    var opts = normalize_opts(options);
+    var text = src.replace(/\r\n?/g, '\n');
+    var toks = lex(text);
+    var elements = group(toks);
+    compute_levels(elements);
+    elements = organize_import_elements(elements);
+    return render_elements(elements, opts);
+}
+
+export function organize_imports(src, options) {
+    var opts = normalize_opts(options);
+    var text = src.replace(/\r\n?/g, '\n');
+    var toks = lex(text);
+    var elements = group(toks);
+    compute_levels(elements);
+    elements = organize_import_elements(elements);
+    return render_elements(elements, opts);
+}
+
 function normalize_opts(options) {
     options = options || {};
     var ll = options.line_length;
@@ -640,7 +841,7 @@ function normalize_opts(options) {
         var pq = options.preferred_quote;
         pref = (pq === 'double' || pq === '"') ? '"' : "'";
     }
-    return { line_length: ll, preferred: pref };
+    return { line_length: ll, preferred: pref, join_lines: !!options.join_lines };
 }
 
 // ---------------------------------------------------------------------------
@@ -671,9 +872,18 @@ export async function collect_pyj_files(inputs) {
             var f = list[i];
             var st;
             try { st = await fs.promises.lstat(f); }
-            catch (e) { throw new Error("can't access: " + f); }
+            catch (e) {
+                if (from_dir && (e.code === 'EACCES' || e.code === 'EPERM')) continue;
+                throw new Error("can't access: " + f);
+            }
             if (st.isDirectory()) {
-                var children = (await fs.promises.readdir(f)).sort().map(function (x) { return path.join(f, x); });
+                var children;
+                try {
+                    children = (await fs.promises.readdir(f)).sort().map(function (x) { return path.join(f, x); });
+                } catch (e) {
+                    if (from_dir && (e.code === 'EACCES' || e.code === 'EPERM')) continue;
+                    throw new Error("can't read directory: " + f);
+                }
                 await walk(children, true);
             } else if (st.isFile()) {
                 if (from_dir) { if (f.endsWith('.pyj')) files.push(f); }
@@ -696,8 +906,36 @@ async function read_stdin() {
     return chunks.join('');
 }
 
+function argv_has_flag(flag_names) {
+    var args = process.argv.slice(3);  // skip: node, script path, mode
+    for (var i = 0; i < args.length; i++) {
+        var a = args[i];
+        if (a === '--') break;
+        for (var j = 0; j < flag_names.length; j++) {
+            var f = flag_names[j];
+            if (a === f || a.startsWith(f + '=')) return true;
+        }
+    }
+    return false;
+}
+
 export async function cli(argv, base_path, src_path, lib_path) {
-    var opts = normalize_opts({ line_length: argv.line_length, preferred_quote: argv.preferred_quote });
+    var ll_from_cli = argv_has_flag(['--line-length', '--line_length', '-l']);
+    var q_from_cli = argv_has_flag(['--preferred-quote', '--preferred_quote', '-q']);
+
+    var effective_ll = ll_from_cli ? (parseInt(argv.line_length, 10) || 80) : null;
+    var effective_quote = q_from_cli ? argv.preferred_quote : null;
+
+    if (!ll_from_cli || !q_from_cli) {
+        var pyconf = await read_pyproject_config(process.cwd());
+        if (!ll_from_cli && pyconf.line_length) effective_ll = pyconf.line_length;
+        if (!q_from_cli && pyconf.preferred_quote) effective_quote = pyconf.preferred_quote;
+    }
+
+    if (!effective_ll) effective_ll = 80;
+    if (!effective_quote) effective_quote = 'single';
+
+    var opts = normalize_opts({ line_length: effective_ll, preferred_quote: effective_quote, join_lines: argv.join_lines });
     var inputs = (argv.files || []).slice();
 
     if (inputs.length === 0) {
@@ -725,10 +963,19 @@ export async function cli(argv, base_path, src_path, lib_path) {
         if (argv.check_only) {
             var errs = check_report(f, code, formatted, opts);
             if (errs.length) { had_errors = true; errs.forEach(function (m) { console.error(m); }); }
-        } else if (formatted !== code.replace(/\r\n?/g, '\n')) {
-            try { await fs.promises.writeFile(f, formatted); }
-            catch (e) { console.error("ERROR: can't write file: " + f); process.exit(2); }
-            console.log('reformatted ' + f);
+        } else {
+            if (formatted !== code.replace(/\r\n?/g, '\n')) {
+                try { await fs.promises.writeFile(f, formatted); }
+                catch (e) { console.error("ERROR: can't write file: " + f); process.exit(2); }
+                console.log('reformatted ' + f);
+            }
+            var flines = formatted.split('\n');
+            for (var li = 0; li < flines.length; li++) {
+                if (flines[li].length > opts.line_length) {
+                    console.error(f + ':' + (li + 1) + ': line exceeds ' + opts.line_length + ' characters (' + flines[li].length + ')');
+                    had_errors = true;
+                }
+            }
         }
     }
     process.exit(had_errors ? 1 : 0);

package/tools/ini.mjs

@@ -60,5 +60,116 @@ async function read_config(toplevel_dir) {
     return parse_ini_data(data);
 }
 
+// ---------------------------------------------------------------------------
+// pyproject.toml reading
+// ---------------------------------------------------------------------------
 
-export { read_config };
+async function find_pyproject_toml(start_dir) {
+    var current = start_dir;
+    while (true) {
+        try {
+            return await fs.promises.readFile(path.join(current, 'pyproject.toml'), 'utf-8');
+        } catch (e) {
+            if (e.code !== 'ENOENT' && e.code !== 'EACCES' && e.code !== 'EPERM') throw e;
+        }
+        var parent = path.dirname(current);
+        if (parent === current) return null;
+        current = parent;
+    }
+}
+
+function parse_toml_sections(text) {
+    // Minimal TOML parser: returns a flat map of dotted-section-name -> {key: value}.
+    // Only handles simple string and integer scalar values needed for config settings.
+    var sections = {};
+    var cur = null;
+    var lines = text.split(/\r?\n/);
+    for (var i = 0; i < lines.length; i++) {
+        var line = lines[i].trim();
+        if (!line || line[0] === '#') continue;
+        // Section header: [tool.ruff] or [tool.ruff.format] — not [[array]] tables.
+        var sec_m = line.match(/^\[([^\[\]]+)\]$/);
+        if (sec_m) {
+            var sec_name = sec_m[1].trim();
+            if (!sections[sec_name]) sections[sec_name] = {};
+            cur = sections[sec_name];
+            continue;
+        }
+        if (!cur) continue;
+        var eq = line.indexOf('=');
+        if (eq < 0) continue;
+        var key = line.slice(0, eq).trim();
+        var rest = line.slice(eq + 1).trim();
+        if (!key) continue;
+        var val;
+        if (rest[0] === '"' || rest[0] === "'") {
+            var q = rest[0];
+            if (rest.slice(0, 3) === q + q + q) continue;  // triple-quoted: skip
+            var j = 1;
+            while (j < rest.length && rest[j] !== q) {
+                if (rest[j] === '\\') j++;
+                j++;
+            }
+            val = rest.slice(1, j);
+        } else {
+            var hash = rest.indexOf('#');
+            if (hash >= 0) rest = rest.slice(0, hash).trim();
+            val = rest;
+        }
+        cur[key] = val;
+    }
+    return sections;
+}
+
+function pyproject_line_length(sections) {
+    var candidates = [
+        ['tool.ruff', 'line-length'],
+        ['tool.black', 'line-length'],
+        ['tool.isort', 'line_length'],
+        ['tool.isort', 'line-length'],
+    ];
+    for (var i = 0; i < candidates.length; i++) {
+        var sec = sections[candidates[i][0]];
+        if (sec && sec[candidates[i][1]] !== undefined) {
+            var ll = parseInt(sec[candidates[i][1]], 10);
+            if (!isNaN(ll) && ll > 0) return ll;
+        }
+    }
+    return null;
+}
+
+function pyproject_quote(sections) {
+    // tool.ruff.format.quote-style (skip 'preserve')
+    var rf = sections['tool.ruff.format'];
+    if (rf && rf['quote-style']) {
+        if (rf['quote-style'] === 'double') return 'double';
+        if (rf['quote-style'] === 'single') return 'single';
+    }
+    // tool.ruff.lint.flake8-quotes.inline-quotes
+    var fq = sections['tool.ruff.lint.flake8-quotes'];
+    if (fq && fq['inline-quotes']) {
+        if (fq['inline-quotes'] === 'double') return 'double';
+        if (fq['inline-quotes'] === 'single') return 'single';
+    }
+    // tool.flake8.inline-quotes
+    var flk = sections['tool.flake8'];
+    if (flk && flk['inline-quotes']) {
+        if (flk['inline-quotes'] === 'double') return 'double';
+        if (flk['inline-quotes'] === 'single') return 'single';
+    }
+    return null;
+}
+
+async function read_pyproject_config(start_dir) {
+    var text = await find_pyproject_toml(start_dir);
+    if (!text) return {};
+    var sections = parse_toml_sections(text);
+    var result = {};
+    var ll = pyproject_line_length(sections);
+    if (ll !== null) result.line_length = ll;
+    var q = pyproject_quote(sections);
+    if (q !== null) result.preferred_quote = q;
+    return result;
+}
+
+export { read_config, read_pyproject_config };

package/tools/lsp.mjs

@@ -22,9 +22,10 @@ import crypto from 'crypto';
 import { pathToFileURL, fileURLToPath } from 'url';
 import * as utils from './utils.mjs';
 import { lint_parsed, BUILTINS, WARN, ERROR, MESSAGES } from './lint.mjs';
-import { format_string } from './fmt.mjs';
+import { format_string, organize_imports } from './fmt.mjs';
 import * as sym from './lsp_symbols.mjs';
 import { create_connection, DocumentStore, TextDocument, ResponseError, ErrorCodes } from './lsp_protocol.mjs';
+import { read_pyproject_config } from './ini.mjs';
 
 const RapydScript = globalThis.create_rapydscript_compiler();
 
@@ -37,7 +38,7 @@ var CompletionItemKind = {
     Class: 7, Interface: 8, Module: 9, Property: 10, Keyword: 14, Constant: 21,
 };
 var SymbolKindLSP = { File: 1, Module: 2, Class: 5, Method: 6, Property: 7, Field: 8, Function: 12, Variable: 13, Constant: 14 };
-var CodeActionKind = { QuickFix: 'quickfix', SourceFixAll: 'source.fixAll', Source: 'source' };
+var CodeActionKind = { QuickFix: 'quickfix', SourceFixAll: 'source.fixAll', Source: 'source', OrganizeImports: 'source.organizeImports' };
 
 function kind_to_completion(kind) {
     switch (kind) {
@@ -72,6 +73,7 @@ export function create_server_context(opts) {
         libdir: opts.libdir || null,                  // stdlib dir (src/lib)
         line_length: opts.line_length || 80,
         preferred_quote: opts.preferred_quote || 'single',
+        join_lines: opts.join_lines || false,
         docs: new DocumentStore(),
         analysis_cache: Object.create(null),          // key -> analysis
         workspace_roots: opts.workspace_roots ? opts.workspace_roots.slice() : [],
@@ -96,6 +98,10 @@ export function apply_configuration(ctx, settings) {
         ctx.preferred_quote = settings.preferredQuote;
     }
 
+    if (settings.joinLines !== undefined && settings.joinLines !== null) {
+        ctx.join_lines = !!settings.joinLines;
+    }
+
     if (settings.importPath !== undefined && settings.importPath !== null) {
         var new_dirs;
         if (Array.isArray(settings.importPath)) {
@@ -276,7 +282,7 @@ function lint_message_to_diagnostic(doc, m) {
 // ---------------------------------------------------------------------------
 export function format_document(ctx, raw_text) {
     var text = normalize(raw_text);
-    var formatted = format_string(text, { line_length: ctx.line_length, preferred_quote: ctx.preferred_quote });
+    var formatted = format_string(text, { line_length: ctx.line_length, preferred_quote: ctx.preferred_quote, join_lines: ctx.join_lines });
     if (formatted === text) return [];
     // Single edit that replaces the whole document.
     var doc = new TextDocument('inmem', 'rapydscript', 0, text);
@@ -284,6 +290,18 @@ export function format_document(ctx, raw_text) {
     return [{ range: { start: { line: 0, character: 0 }, end: end }, newText: formatted }];
 }
 
+// ---------------------------------------------------------------------------
+// Organize imports
+// ---------------------------------------------------------------------------
+export function organize_imports_document(ctx, raw_text) {
+    var text = normalize(raw_text);
+    var organized = organize_imports(text, { line_length: ctx.line_length, preferred_quote: ctx.preferred_quote, join_lines: ctx.join_lines });
+    if (organized === text) return [];
+    var doc = new TextDocument('inmem', 'rapydscript', 0, text);
+    var end = doc.position_at(text.length);
+    return [{ range: { start: { line: 0, character: 0 }, end: end }, newText: organized }];
+}
+
 // ---------------------------------------------------------------------------
 // Completion
 // ---------------------------------------------------------------------------
@@ -722,6 +740,9 @@ export async function code_actions(ctx, uri, raw_text, range, diagnostics) {
     // Source action: format the document.
     var fmt_edits = format_document(ctx, a.text);
     if (fmt_edits.length) actions.push({ title: 'Format document', kind: CodeActionKind.Source, edit: { changes: single_change(uri, fmt_edits) } });
+    // Source action: organize imports.
+    var org_edits = organize_imports_document(ctx, a.text);
+    if (org_edits.length) actions.push({ title: 'Organize imports', kind: CodeActionKind.OrganizeImports, edit: { changes: single_change(uri, org_edits) } });
     return actions;
 }
 
@@ -754,12 +775,41 @@ export async function document_symbols(ctx, uri, raw_text) {
 // ===========================================================================
 // Server / CLI
 // ===========================================================================
+function argv_has_flag(flag_names) {
+    var args = process.argv.slice(3);  // skip: node, script path, mode
+    for (var i = 0; i < args.length; i++) {
+        var a = args[i];
+        if (a === '--') break;
+        for (var j = 0; j < flag_names.length; j++) {
+            var f = flag_names[j];
+            if (a === f || a.startsWith(f + '=')) return true;
+        }
+    }
+    return false;
+}
+
 export async function cli(argv, base_path, src_path, lib_path) {
+    var ll_from_cli = argv_has_flag(['--line-length', '--line_length', '-l']);
+    var q_from_cli = argv_has_flag(['--preferred-quote', '--preferred_quote', '-q']);
+
+    var effective_ll = ll_from_cli ? (parseInt(argv.line_length, 10) || 80) : null;
+    var effective_quote = q_from_cli ? argv.preferred_quote : null;
+
+    if (!ll_from_cli || !q_from_cli) {
+        var pyconf = await read_pyproject_config(process.cwd());
+        if (!ll_from_cli && pyconf.line_length) effective_ll = pyconf.line_length;
+        if (!q_from_cli && pyconf.preferred_quote) effective_quote = pyconf.preferred_quote;
+    }
+
+    if (!effective_ll) effective_ll = 80;
+    if (!effective_quote) effective_quote = 'single';
+
     var ctx = create_server_context({
         import_dirs: utils.get_import_dirs(argv.import_path).map(function (p) { return path.resolve(p); }),
         libdir: path.join(src_path, 'lib'),
-        line_length: parseInt(argv.line_length, 10) || 80,
-        preferred_quote: argv.preferred_quote || 'single',
+        line_length: effective_ll,
+        preferred_quote: effective_quote,
+        join_lines: argv.join_lines || false,
     });
 
     // Diagnostics are pushed to the client, debounced per document.
@@ -797,7 +847,7 @@ export async function cli(argv, base_path, src_path, lib_path) {
                 renameProvider: true,
                 documentFormattingProvider: true,
                 documentSymbolProvider: true,
-                codeActionProvider: { codeActionKinds: [CodeActionKind.QuickFix, CodeActionKind.Source] },
+                codeActionProvider: { codeActionKinds: [CodeActionKind.QuickFix, CodeActionKind.Source, CodeActionKind.OrganizeImports] },
             },
             serverInfo: { name: 'rapydscript-lsp', version: '1.0.0' },
         };

package/tools/repl.mjs

@@ -12,6 +12,7 @@ import vm from 'vm';
 import util from 'util';
 import { createRequire } from 'module';
 import * as utils from './utils.mjs';
+import { EMBEDDED_STDLIB_PREFIX } from './compiler.mjs';
 import completelib from './completer.mjs';
 
 var colored = utils.safe_colored;
@@ -84,7 +85,9 @@ export default async function(options) {
 
     // Read baselib synchronously: the repl must initialize synchronously so
     // that the readline interface and prompt are ready before returning.
-    var baselib_plain = fs.readFileSync(path.join(options.lib_path, 'baselib-plain-pretty.js'), 'utf-8');
+    const _embedded = globalThis.__rapydscript_embedded__;
+    var baselib_plain = _embedded?.['baselib-plain-pretty.js'] ??
+        fs.readFileSync(path.join(options.lib_path, 'baselib-plain-pretty.js'), 'utf-8');
 
     function print_ast(ast, keep_baselib) {
         var output_options = {omit_baselib:!keep_baselib, write_name:false, private_scope:false, beautify:true, keep_docstrings:true};
@@ -160,7 +163,7 @@ export default async function(options) {
             toplevel = await RapydScript.parse(source, {
                 'filename':'<repl>',
                 'basedir': process.cwd(),
-                'libdir': options.imp_path,
+                'libdir': globalThis.__rapydscript_embedded__ ? EMBEDDED_STDLIB_PREFIX : options.imp_path,
                 'import_dirs': import_dirs,
                 'classes': classes,
                 'scoped_flags': scoped_flags,