lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-05-04 10:43:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: improved regex pattern, removes backrefs

Browse source
This commit is contained in:
Erica Marigold 2023-08-11 12:07:24 +05:30 • committed by GitHub
parent f9919a40aa
commit 37c8582c4e
Signed by: DevComp
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/cli/repl.rs
View file

@ -8,7 +8,7 @@ use std::{
use anyhow::Error; use anyhow::Error;
use clap::Command; use clap::Command;
use fancy_regex::Regex; use regex::Regex;
use lune::lua::stdio::formatting::{pretty_format_luau_error, pretty_format_value}; use lune::lua::stdio::formatting::{pretty_format_luau_error, pretty_format_value};
use lune::Lune; use lune::Lune;
use mlua::ExternalError; use mlua::ExternalError;
@ -77,14 +77,8 @@ pub async fn show_interface(cmd: Command) -> Result<ExitCode, Error> {
!env_var_bool(no_color).unwrap_or_else(|| false) !env_var_bool(no_color).unwrap_or_else(|| false)
} }
}); });
// Group 2 of this match pattern is the variable contents const VARIABLE_DECLARATION_PAT: &str = r#"(local)?\s*(.*)\s*(=)\s*(.*)\s*"#;
// We're using fancy_regex instead of regex for backreferences
// and lookaround. I'm not too good at regex, so if there's a
// way to do this without backreferences and lookarounds,
// please let me know.
const VARIABLE_DECLARATION_PAT: &str = r#"(?!local.*)(?!\s)(=\s*)(.*)"#;
// HACK: Prepend this "context" to the source code provided, // HACK: Prepend this "context" to the source code provided,
// so that the variable is preserved even the following steps // so that the variable is preserved even the following steps
@ -138,7 +132,7 @@ pub async fn show_interface(cmd: Command) -> Result<ExitCode, Error> {
match eval_result { match eval_result {
Ok(_) => { Ok(_) => {
if Regex::new(VARIABLE_DECLARATION_PAT)?.is_match(&source_code)? if Regex::new(VARIABLE_DECLARATION_PAT)?.is_match(&source_code)
&& !&source_code.contains("\n") && !&source_code.contains("\n")
{ {
let declaration = source_code.split("=").collect::<Vec<&str>>()[1] let declaration = source_code.split("=").collect::<Vec<&str>>()[1]