Skip to content

lua format 格式化支持使用工程内的 .lua-format 配置文件#224

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

Open
dulingzhi wants to merge 1 commit into
base:master
Choose a base branch
from
Open

lua format 格式化支持使用工程内的 .lua-format 配置文件 #224

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
21 changes: 17 additions & 4 deletions luahelper-vscode/src/luaformat.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import * as vscode from 'vscode';
import * as path from "path";
import * as child_process from "child_process";
import * as fs from "fs";

function needShowFormatErr(): boolean {
let formatErrConfig = vscode.workspace.getConfiguration("luahelper.base", null).get("formatErrShow");
Expand DownExpand Up@@ -57,9 +58,21 @@ function getFormatBoolStr(itemStr: string): string {
}

// 获取格式化配置的参数
function getFormatConfigStrTable(): string[] {
let strAllResult: string[] = [];
function getFormatConfigStrTable(fileName: string): string[] {

if (vscode.workspace.workspaceFolders) {
for (let i = 0; i < vscode.workspace.workspaceFolders.length; i++) {
const folder = vscode.workspace.workspaceFolders[i];
if (fileName.startsWith(folder.uri.fsPath)) {
const c = path.join(folder.uri.fsPath, ".lua-format");
if (fs.existsSync(c)){
return ["-c", c];
}
}
}
}

let strAllResult: string[] = [];
let oneStr: string = "";
oneStr = getFormatIntStr("column_limit");
if (oneStr !== "") {
Expand DownExpand Up@@ -244,7 +257,7 @@ export class LuaFormatRangeProvider implements vscode.DocumentRangeFormattingEdi
let data = document.getText();
data = data.substring(document.offsetAt(range.start), document.offsetAt(range.end));
let formatErrshow = needShowFormatErr();
let formatConfigStrTable: string[] = getFormatConfigStrTable();
let formatConfigStrTable: string[] = getFormatConfigStrTable(document.fileName);
return new Promise((resolve, reject) => {
let binaryPath = GetLuaFmtPath(this.context);
if (binaryPath === "") {
Expand DownExpand Up@@ -305,7 +318,7 @@ export class LuaFormatProvider implements vscode.DocumentFormattingEditProvider
var data = document.getText();

let formatErrshow = needShowFormatErr();
let formatConfigStrTable: string[] = getFormatConfigStrTable();
let formatConfigStrTable: string[] = getFormatConfigStrTable(document.fileName);
return new Promise((resolve, reject) => {
let binaryPath = GetLuaFmtPath(this.context);
if (binaryPath === "") {
Expand Down