weyne/dcs-lua-runner
1
0
Fork 0
mirror of https://github.com/omltcat/dcs-lua-runner.git synced 2025-11-10 15:49:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release 1.1.4

Browse Source
This commit is contained in:
Omelette 蛋卷 2024-02-04 21:42:15 -05:00
parent b11fc3f1d7
commit b2f0f7f479
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -66,3 +66,12 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
### Fixed ### Fixed
- Fix JSON to Lua table regex. - Fix JSON to Lua table regex.
## [1.1.4] - 2024-02-04
### Changed
- Config 'showQuickButtons' is now 'quickButtons' to avoid splitting other entries.
- Disable status bar button tooltip to prevent obscuring notifications.
### Fixed
- File display not showing if directory does not exist.

6
package.json
View File

@ -32,12 +32,12 @@
"dcsLuaRunner.serverPort": { "dcsLuaRunner.serverPort": {
"type": "number", "type": "number",
"default": 12080, "default": 12080,
"description": "Remote DCS Fiddle port." "description": "Remote DCS Fiddle port for mission env. GUI env will automatically be on the next port (12081 by default)."
}, },
"dcsLuaRunner.useHttps": { "dcsLuaRunner.useHttps": {
"type": "boolean", "type": "boolean",
"default": false, "default": false,
"description": "If server is behind a HTTPS reverse proxy. You should also change the port to 443." "description": "Set if server is behind a HTTPS reverse proxy. You should also change server port accordingly (443)."
}, },
"dcsLuaRunner.webAuthUsername": { "dcsLuaRunner.webAuthUsername": {
"type": "string", "type": "string",
@ -71,7 +71,7 @@
"default": "JSON", "default": "JSON",
"description": "Note: Experimental feature! Original returned data is in JSON. Conversion to Lua table is done after receiving data and may not be 100% accurate. Please report any issues." "description": "Note: Experimental feature! Original returned data is in JSON. Conversion to Lua table is done after receiving data and may not be 100% accurate. Please report any issues."
}, },
"dcsLuaRunner.showQuickButtons": { "dcsLuaRunner.quickButtons": {
"type": "boolean", "type": "boolean",
"default": false, "default": false,
"description": "Show buttons to quickly switch settings beside the run button." "description": "Show buttons to quickly switch settings beside the run button."

14
src/extension.ts
View File

@ -11,7 +11,7 @@ async function runLua(lua: string, outputChannel: vscode.OutputChannel, filename
const runCodeLocally = config.get('runCodeLocally') as boolean; const runCodeLocally = config.get('runCodeLocally') as boolean;
const runInMissionEnv = config.get('runInMissionEnv') as boolean; const runInMissionEnv = config.get('runInMissionEnv') as boolean;
const serverAddress = runCodeLocally ? '127.0.0.1' : config.get('serverAddress') as string; const serverAddress = runCodeLocally ? '127.0.0.1' : config.get('serverAddress') as string;
const serverPort = runCodeLocally ? 12080 : config.get('serverPort') as number + (runInMissionEnv ? 0 : 1); const serverPort = (runCodeLocally ? 12080 : config.get('serverPort') as number) + (runInMissionEnv ? 0 : 1);
const useHttps = runCodeLocally ? false : config.get('useHttps') as boolean; const useHttps = runCodeLocally ? false : config.get('useHttps') as boolean;
const authUsername = config.get('webAuthUsername') as string; const authUsername = config.get('webAuthUsername') as string;
const authPassword = config.get('webAuthPassword') as string; const authPassword = config.get('webAuthPassword') as string;
@ -27,7 +27,13 @@ async function runLua(lua: string, outputChannel: vscode.OutputChannel, filename
} else if (returnDisplay === 'file') { } else if (returnDisplay === 'file') {
const activeEditor = vscode.window.activeTextEditor; const activeEditor = vscode.window.activeTextEditor;
const workspaceFolder = vscode.workspace.workspaceFolders ? vscode.workspace.workspaceFolders[0].uri.fsPath : ''; const workspaceFolder = vscode.workspace.workspaceFolders ? vscode.workspace.workspaceFolders[0].uri.fsPath : '';
const filePath = `${workspaceFolder}/.vscode/dcs_lua_output.${returnDisplayFormat}`; const vscodeFolderPath = `${workspaceFolder}/.vscode`;
const filePath = `${vscodeFolderPath}/dcs_lua_output.${returnDisplayFormat}`;
// Create the .vscode directory if it doesn't exist
if (!fs.existsSync(vscodeFolderPath)) {
fs.mkdirSync(vscodeFolderPath);
}
// Create the file if it doesn't exist // Create the file if it doesn't exist
if (!fs.existsSync(filePath)) { if (!fs.existsSync(filePath)) {
fs.writeFileSync(filePath, ''); fs.writeFileSync(filePath, '');
@ -151,7 +157,7 @@ export function activate(context: vscode.ExtensionContext) {
const runTarget = runCodeLocally ? 'local machine' : 'remote server'; const runTarget = runCodeLocally ? 'local machine' : 'remote server';
const runEnv = runInMissionEnv ? 'mission' : 'GUI'; const runEnv = runInMissionEnv ? 'mission' : 'GUI';
const serverAddress = runCodeLocally ? '127.0.0.1' : config.get('serverAddress') as string; const serverAddress = runCodeLocally ? '127.0.0.1' : config.get('serverAddress') as string;
const serverPort = runCodeLocally ? 12080 : config.get('serverPort') as number + (runInMissionEnv ? 0 : 1); const serverPort = (runCodeLocally ? 12080 : config.get('serverPort') as number) + (runInMissionEnv ? 0 : 1);
if (config.get('returnDisplay') === 'Console Output') { if (config.get('returnDisplay') === 'Console Output') {
outputChannel.show(true); outputChannel.show(true);
outputChannel.appendLine(`[DCS] Settings: Run code in ${runEnv} environment on ${runTarget} (${serverAddress}:${serverPort}).`); outputChannel.appendLine(`[DCS] Settings: Run code in ${runEnv} environment on ${runTarget} (${serverAddress}:${serverPort}).`);
@ -198,7 +204,7 @@ export function activate(context: vscode.ExtensionContext) {
vscode.commands.executeCommand('setContext', 'luaFileActive', vscode.window.activeTextEditor.document.languageId === 'lua'); vscode.commands.executeCommand('setContext', 'luaFileActive', vscode.window.activeTextEditor.document.languageId === 'lua');
} }
let statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 100); let statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 100);
statusBarItem.tooltip = 'DCS Lua Runner: Click to change settings'; // statusBarItem.tooltip = 'DCS Lua Runner: Click to change settings';
statusBarItem.show(); statusBarItem.show();
statusBarItem.command = 'extension.showQuickPick'; statusBarItem.command = 'extension.showQuickPick';
context.subscriptions.push(statusBarItem); context.subscriptions.push(statusBarItem);