Update to version 1.9.1

Update to version 1.9.1

Author: twibiral

.gitignore

@@ -20,3 +20,4 @@ data.json
 
 # Exclude macOS Finder (System Explorer) View States
 .DS_Store
+*.log

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 
+## [1.9.1]
+### Changed
+- Fix bug produced by duplicate labeled code blocks (Thanks to @qiaogaojian)
+
+### Added
+- Option for better handling of logs (Thanks to @qiaogaojian)
+- Make labels work with code blocks with `run-` prefix (Thanks to @qiaogaojian)
+
+
 ## [1.9.0]
 ### Changed
 - Fix app://local deprecation (New minimal Obsidian version: v1.2.8) (Thanks to @mayurankv)

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "execute-code",
 	"name": "Execute Code",
-	"version": "1.9.0",
+	"version": "1.9.1",
 	"minAppVersion": "1.2.8",
 	"description": "Allows to execute code snippets within a note. Supported programming languages:  C, CPP, Dart, Golang, Groovy, Kotlin, Java, JavaScript, TypeScript, Lean, Lua, CSharp, Prolog, Rust, Python, R, Ruby, Wolfram Mathematica, Haskell, Scala, Racket, F#, Batch, Shell & Powershell.",
 	"author": "twibiral",

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "execute-code",
-	"version": "1.9.0",
+	"version": "1.9.1",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "src/main.js",
 	"scripts": {

package.json

@@ -9,6 +9,7 @@ export interface ExecutorSettings {
 	timeout: number;
 	allowInput: boolean;
 	wslMode: boolean;
+	onlyCurrentBlock: boolean;
 	nodePath: string;
 	nodeArgs: string;
 	jsFileExtension: string;
@@ -170,6 +171,7 @@ export const DEFAULT_SETTINGS: ExecutorSettings = {
 	timeout: 10000,
 	allowInput: true,
 	wslMode: false,
+	onlyCurrentBlock: false,
 	nodePath: "node",
 	nodeArgs: "",
 	jsFileExtension: "js",

src/settings/Settings.ts

@@ -100,6 +100,17 @@ export class SettingsTab extends PluginSettingTab {
 					}));
 		}
 
+		new Setting(containerEl)
+			.setName('Only Current Log')
+			.setDesc("Whether or not show print log only in current code block.")
+			.addToggle(text => text
+				.setValue(this.plugin.settings.onlyCurrentBlock)
+				.onChange(async (value) => {
+					console.log('Only Show Current Block Log set to: ' + value);
+					this.plugin.settings.onlyCurrentBlock = value
+					await this.plugin.saveSettings();
+				}));
+
 		// TODO setting per language that requires main function if main function should be implicitly made or not, if not, non-main blocks will not have a run button
 
 		containerEl.createEl("hr");

src/settings/SettingsTab.ts

@@ -85,7 +85,7 @@ export class CodeInjector {
 				new Notice(`Named export "${namedImport}" does not exist but was imported`);
 				return true;
 			}
-			this.namedImportSrcCode += `${this.namedExports[namedImport]}\n`;
+			this.namedImportSrcCode += `${this.disable_print(this.namedExports[namedImport])}\n`;
 			return false;
 		};
 		// Single import
@@ -145,13 +145,13 @@ export class CodeInjector {
 					if (!Array.isArray(currentArgs.export))
 						currentArgs.export = [currentArgs.export];
 					if (currentArgs.export.contains("pre"))
-						this.prependSrcCode += `${currentCode}\n`;
+						this.prependSrcCode += `${this.disable_print(currentCode)}\n`;
 					if (currentArgs.export.contains("post"))
-						this.appendSrcCode += `${currentCode}\n`;
+						this.appendSrcCode += `${this.disable_print(currentCode)}\n`;
 					currentLanguage = "";
 					currentCode = "";
 					insideCodeBlock = false;
-
+					currentArgs = {};
 				}
 
 				// reached start of code block
@@ -170,4 +170,13 @@ export class CodeInjector {
 			}
 		}
 	}
+
+	private disable_print(code: String): String {
+		if (!this.settings.onlyCurrentBlock) {
+			return code;
+		}
+		const pattern: RegExp = /^print\s*(.*)/gm;
+		// 使用正则表达式替换函数将符合条件的内容注释掉
+		return code.replace(pattern, ' ');
+	}
 }

src/transforms/CodeInjector.ts

@@ -57,5 +57,19 @@ export function transformMagicCommands(app: App, srcCode: string) {
  * @returns The language of the code block.
  */
 export function getCodeBlockLanguage(firstLineOfCode: string) {
-	return getLanguageAlias(firstLineOfCode.split("```")[1].trim().split(" ")[0].split("{")[0])
+	let currentLanguage: string = firstLineOfCode.split("```")[1].trim().split(" ")[0].split("{")[0];
+	if (isStringNotEmpty(currentLanguage) && currentLanguage.startsWith("run-")) {
+		currentLanguage = currentLanguage.replace("run-", "");
+	}
+	return getLanguageAlias(currentLanguage);
+}
+
+/**
+ * Check if a string is not empty
+ *
+ * @param str Input string
+ * @returns True when string not empty, False when the string is Empty
+ */
+export function isStringNotEmpty(str: string): boolean {
+	return !!str && str.trim().length > 0;
 }

src/transforms/TransformCode.ts

@@ -42,5 +42,6 @@
 	"1.7.1": "0.12.0",
 	"1.8.0": "0.12.0",
 	"1.8.1": "0.12.0",
-	"1.9.0": "1.2.8"
+	"1.9.0": "1.2.8",
+	"1.9.1": "1.2.8"
 }