mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2026-04-24 02:03:01 +02:00
FILES: Path rework & typesafety (#479)
* Added new types for various file paths, all in the Paths folder. * TypeSafety and other helper functions related to these types * Added basic globbing support with * and ?. Currently only implemented for Script/Text, on nano and download terminal commands * Enforcing the new types throughout the codebase, plus whatever rewrites happened along the way * Server.textFiles is now a map * TextFile no longer uses a fn property, now it is filename * Added a shared ContentFile interface for shared functionality between TextFile and Script. * related to ContentFile change above, the player is now allowed to move a text file to a script file and vice versa. * File paths no longer conditionally start with slashes, and all directory names other than root have ending slashes. The player is still able to provide paths starting with / but this now indicates that the player is specifying an absolute path instead of one relative to root. * Singularized the MessageFilename and LiteratureName enums * Because they now only accept correct types, server.writeToXFile functions now always succeed (the only reasons they could fail before were invalid filepath). * Fix several issues with tab completion, which included pretty much a complete rewrite * Changed the autocomplete display options so there's less chance it clips outside the display area. * Turned CompletedProgramName into an enum. * Got rid of programsMetadata, and programs and DarkWebItems are now initialized immediately instead of relying on initializers called from the engine. * For any executable (program, cct, or script file) pathing can be used directly to execute without using the run command (previously the command had to start with ./ and it wasn't actually using pathing).
This commit is contained in:
@@ -10,9 +10,9 @@ import TextField from "@mui/material/TextField";
|
||||
import { KEY, KEYCODE } from "../../utils/helpers/keyCodes";
|
||||
import { Terminal } from "../../Terminal";
|
||||
import { Player } from "@player";
|
||||
import { determineAllPossibilitiesForTabCompletion } from "../determineAllPossibilitiesForTabCompletion";
|
||||
import { tabCompletion } from "../tabCompletion";
|
||||
import { getTabCompletionPossibilities } from "../getTabCompletionPossibilities";
|
||||
import { Settings } from "../../Settings/Settings";
|
||||
import { longestCommonStart } from "../../utils/StringHelperFunctions";
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) =>
|
||||
createStyles({
|
||||
@@ -26,7 +26,6 @@ const useStyles = makeStyles((theme: Theme) =>
|
||||
padding: theme.spacing(0),
|
||||
},
|
||||
preformatted: {
|
||||
whiteSpace: "pre-wrap",
|
||||
margin: theme.spacing(0),
|
||||
},
|
||||
list: {
|
||||
@@ -205,54 +204,18 @@ export function TerminalInput(): React.ReactElement {
|
||||
}
|
||||
|
||||
// Autocomplete
|
||||
if (event.key === KEY.TAB && value !== "") {
|
||||
if (event.key === KEY.TAB) {
|
||||
event.preventDefault();
|
||||
|
||||
let copy = value;
|
||||
const semiColonIndex = copy.lastIndexOf(";");
|
||||
if (semiColonIndex !== -1) {
|
||||
copy = copy.slice(semiColonIndex + 1);
|
||||
}
|
||||
|
||||
copy = copy.trim();
|
||||
copy = copy.replace(/\s\s+/g, " ");
|
||||
|
||||
const commandArray = copy.split(" ");
|
||||
let index = commandArray.length - 2;
|
||||
if (index < -1) {
|
||||
index = 0;
|
||||
}
|
||||
const allPos = await determineAllPossibilitiesForTabCompletion(copy, index, Terminal.cwd());
|
||||
if (allPos.length == 0) {
|
||||
const possibilities = await getTabCompletionPossibilities(value, Terminal.cwd());
|
||||
if (possibilities.length === 0) return;
|
||||
if (possibilities.length === 1) {
|
||||
saveValue(value.replace(/[^ ]*$/, possibilities[0]) + " ");
|
||||
return;
|
||||
}
|
||||
|
||||
let arg = "";
|
||||
let command = "";
|
||||
if (commandArray.length == 0) {
|
||||
return;
|
||||
}
|
||||
if (commandArray.length == 1) {
|
||||
command = commandArray[0];
|
||||
} else if (commandArray.length == 2) {
|
||||
command = commandArray[0];
|
||||
arg = commandArray[1];
|
||||
} else if (commandArray.length == 3) {
|
||||
command = commandArray[0] + " " + commandArray[1];
|
||||
arg = commandArray[2];
|
||||
} else {
|
||||
arg = commandArray.pop() + "";
|
||||
command = commandArray.join(" ");
|
||||
}
|
||||
|
||||
let newValue = tabCompletion(command, arg, allPos, value);
|
||||
if (typeof newValue === "string" && newValue !== "") {
|
||||
if (!newValue.endsWith(" ") && !newValue.endsWith("/") && allPos.length === 1) newValue += " ";
|
||||
saveValue(newValue);
|
||||
}
|
||||
if (Array.isArray(newValue)) {
|
||||
setPossibilities(newValue);
|
||||
}
|
||||
// More than one possibility, check to see if there is a longer common string than currentText.
|
||||
const longestMatch = longestCommonStart(possibilities);
|
||||
saveValue(value.replace(/[^ ]*$/, longestMatch));
|
||||
setPossibilities(possibilities);
|
||||
}
|
||||
|
||||
// Clear screen.
|
||||
@@ -310,6 +273,7 @@ export function TerminalInput(): React.ReactElement {
|
||||
} else {
|
||||
++Terminal.commandHistoryIndex;
|
||||
const prevCommand = Terminal.commandHistory[Terminal.commandHistoryIndex];
|
||||
|
||||
saveValue(prevCommand);
|
||||
}
|
||||
}
|
||||
@@ -405,7 +369,12 @@ export function TerminalInput(): React.ReactElement {
|
||||
onKeyDown: onKeyDown,
|
||||
}}
|
||||
></TextField>
|
||||
<Popper open={possibilities.length > 0} anchorEl={terminalInput.current} placement={"top-start"}>
|
||||
<Popper
|
||||
open={possibilities.length > 0}
|
||||
anchorEl={terminalInput.current}
|
||||
placement={"top"}
|
||||
sx={{ maxWidth: "75%" }}
|
||||
>
|
||||
<Paper sx={{ m: 1, p: 2 }}>
|
||||
<Typography classes={{ root: classes.preformatted }} color={"primary"} paragraph={false}>
|
||||
Possible autocomplete candidates:
|
||||
|
||||
Reference in New Issue
Block a user