Skip to content

Commit f1862ce

Browse files
committed
fixes #7 : added comment symbol removal
1 parent e972784 commit f1862ce

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "leetcode-runner-cli"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
edition = "2021"
55

66
[dependencies]

src/file_parser/codefile.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl CodeFile {
4949
std::process::exit(1);
5050
};
5151

52-
let parsed_file = Self::parse_code(&code);
52+
let parsed_file = Self::parse_code(&code, code_file.language);
5353
let Ok((question_title, parsed_code)) = parsed_file else{
5454
eprintln!("Error parsing the code file!\n{}", parsed_file.unwrap_err());
5555
std::process::exit(1);
@@ -75,7 +75,7 @@ impl CodeFile {
7575
))
7676
}
7777

78-
fn parse_code(code: &str) -> Result<(String, String), &str> {
78+
fn parse_code(code: &str, language: Language) -> Result<(String, String), &str> {
7979
let question_title: String;
8080
let parsed_code: String;
8181
let start = code
@@ -94,7 +94,9 @@ impl CodeFile {
9494
} else {
9595
return Err("No leetcode problem found in the code file. Please add the problem link in the code file using comments.");
9696
}
97-
parsed_code = code[start..end].to_string();
97+
let code = code[start..end].trim();
98+
let code = code.trim_end_matches(language.inline_comment_start());
99+
parsed_code = code.to_string();
98100

99101
Ok((question_title, parsed_code))
100102
}
@@ -110,7 +112,7 @@ impl CodeFile {
110112
eprintln!("Error while reading file {}!", path.display());
111113
std::process::exit(1);
112114
};
113-
let parsed_file = Self::parse_code(&code);
115+
let parsed_file = Self::parse_code(&code, valid_file.language);
114116
let Ok((question_title, parsed_code)) = parsed_file else{
115117
eprintln!("Error parsing the code file!\n{}", parsed_file.unwrap_err());
116118
std::process::exit(1);

src/file_parser/language.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#[derive(Default)]
1+
#[derive(Default, Clone, Copy)]
22
pub enum Language {
33
#[default]
44
Rust,

0 commit comments

Comments
 (0)