fix(vscode): header_guard works properly for edited file, no longer c…

…auses dupe errors

src/base/jwinfsel.cpp

@@ -1269,6 +1269,16 @@ void derelativize_path(char* dest, char const* src_path)
     strcpy(dest, result.string().c_str());
 }
 
+/* derelativize_path:
+  *  Takes a relative path from the root directory, and returns its' absolute path.
+  */
+std::string derelativize_path(std::string src_path)
+{
+	char rootpath[PATH_MAX] = {0};
+	get_root_path(rootpath, PATH_MAX);
+    return (std::filesystem::path(rootpath) / src_path).string();
+}
+
 /* jwin_file_browse_ex:
   *  Same as jwin_file_select but it lets you give it a list of
   *  possible extensions to choose from.

src/base/jwinfsel.h

@@ -76,6 +76,7 @@ void get_root_path(char* path, int32_t size);
 void relativize_path(char* dest, char const* path);
 std::string relativize_path(std::string src_path);
 void derelativize_path(char* dest, char const* path);
+std::string derelativize_path(std::string src_path);
 
 typedef struct EXT_LIST
 {

src/parser/ScriptParser.cpp

@@ -29,6 +29,40 @@ using std::unique_ptr;
 using std::shared_ptr;
 using namespace ZScript;
 
+#include <allegro/alcompat.h>
+#if (DEVICE_SEPARATOR != 0) && (DEVICE_SEPARATOR != '\0')
+#define HAVE_DIR_LIST
+#endif
+static void get_root_path(char* path, int32_t size)
+{
+#ifdef HAVE_DIR_LIST
+	int32_t drive = _al_getdrive();
+#else
+	int32_t drive = 0;
+#endif
+
+    _al_getdcwd(drive, path, size - ucwidth(OTHER_PATH_SEPARATOR));
+	fix_filename_case(path);
+	fix_filename_slashes(path);
+	put_backslash(path);
+}
+
+static std::filesystem::path relativize_path(std::string src_path)
+{
+	char rootpath[PATH_MAX] = {0};
+	get_root_path(rootpath, PATH_MAX);
+    return std::filesystem::relative(src_path, rootpath);
+}
+
+static std::filesystem::path derelativize_path(std::string src_path)
+{
+	char rootpath[PATH_MAX] = {0};
+	get_root_path(rootpath, PATH_MAX);
+	char buf[PATH_MAX*2] = {0};
+	return (std::filesystem::path(rootpath) / src_path).lexically_normal();
+}
+
+
 extern std::vector<string> ZQincludePaths;
 //#define PARSER_DEBUG
 
@@ -205,6 +239,7 @@ string* ScriptParser::checkIncludes(string& includePath, string const& importnam
 	return NULL;
 }
 
+extern std::vector<std::filesystem::path> force_ignores;
 bool ScriptParser::valid_include(ASTImportDecl& decl, string& ret_fname)
 {
 	if(decl.wasValidated())
@@ -242,10 +277,28 @@ bool ScriptParser::valid_include(ASTImportDecl& decl, string& ret_fname)
 	}
 	string filename = fname ? *fname : prepareFilename(importname); //Check root dir last, if nothing has been found yet.
 	ret_fname = filename;
-	FILE* f = fopen(filename.c_str(), "r");
+	//Note: If the user gives an absolute path, `relpath` will be that absolute path!
+	std::filesystem::path relpath = std::filesystem::path(filename).lexically_normal();
+	std::filesystem::path abspath = derelativize_path(filename);
+	FILE* f = fopen(abspath.string().c_str(), "r");
+	if(f)
+	{
+		fclose(f);
+		if(std::find(force_ignores.begin(), force_ignores.end(), abspath) != force_ignores.end())
+		{
+			decl.disable();
+			return true;
+		}
+	}
+	f = fopen(filename.c_str(), "r");
 	if(f)
 	{
 		fclose(f);
+		if(std::find(force_ignores.begin(), force_ignores.end(), relpath) != force_ignores.end())
+		{
+			decl.disable();
+			return true;
+		}
 		//zconsole_db("Importing filename '%s' successfully", filename.c_str());
 		decl.setFilename(filename);
 		decl.validate();
@@ -262,6 +315,7 @@ bool ScriptParser::preprocess_one(ASTImportDecl& importDecl, int32_t reclimit)
 		log_error(CompileError::CantOpenImport(&importDecl, filename));
 		return false;
 	}
+	if(importDecl.isDisabled()) return true;
 	unique_ptr<ASTFile> imported(parseFile(filename));
 	if (!imported.get())
 	{

src/parser/parser.cpp

@@ -264,6 +264,7 @@ void updateIncludePaths()
 }
 
 bool delay_asserts = false, ignore_asserts = false;
+std::vector<std::filesystem::path> force_ignores;
 int32_t main(int32_t argc, char **argv)
 {
 	common_main_setup(App::zscript, argc, argv);
@@ -280,7 +281,16 @@ int32_t main(int32_t argc, char **argv)
 		delay_asserts = ignore_asserts = true;
 	else if(used_switch(argc, argv, "-delay_cassert"))
 		delay_asserts = true;
-
+
+	if(auto index = used_switch(argc, argv, "-force_ignore"))
+	{
+		for(int q = index+1; q < argc; ++q)
+		{
+			if(argv[q][0] == '-') break;
+			force_ignores.push_back(std::filesystem::path(argv[q]).lexically_normal());
+		}
+	}
+
 	int32_t console_path_index = used_switch(argc, argv, "-console");
 	if (linked && !console_path_index)
 	{
@@ -326,7 +336,7 @@ int32_t main(int32_t argc, char **argv)
 			argv[qr_hex_index + 1] :
 			// TODO: set to defaults in a better way.
 			"B343AFAF01C281A00DA58A4211A608DFDF080001162A0410FC5306FE2A274100381B02044031300000065824000000000000D0030000000000000000000000000000000000000000000000000000000034866C3140320000000000000000000000000000";
-		printf("%s\n", qr_hex.c_str());
+		//printf("%s\n", qr_hex.c_str());
 		if (qr_hex.size() != QUESTRULES_NEW_SIZE * 2)
 		{
 			zconsole_error("Error: -qr hex string must be of length %d", QUESTRULES_NEW_SIZE * 2);

vscode-extension/server/package.json

@@ -8,7 +8,8 @@
 	},
 	"dependencies": {
 		"vscode-languageserver": "^8.1.0",
-		"vscode-languageserver-textdocument": "^1.0.8"
+		"vscode-languageserver-textdocument": "^1.0.8",
+		"vscode-uri": "^2.1.1"
 	},
 	"scripts": {}
 }

vscode-extension/server/src/server.ts

@@ -12,7 +12,7 @@ import {
 	TextDocumentSyncKind,
 	InitializeResult
 } from 'vscode-languageserver/node';
-
+import {URI} from 'vscode-uri';
 import {
 	TextDocument
 } from 'vscode-languageserver-textdocument';
@@ -197,10 +197,18 @@ async function processScript(textDocument: TextDocument): Promise<void> {
 		console.log(`Attempting to compile buffer:\n-----\n${includeText}\n-----`);
 	}
 	try {
+		let originPath = URI.parse(textDocument.uri).fsPath;
+		if(originPath.match(/[a-z]:\\.*/))
+		{
+			const letter = originPath.at(0);
+			if(letter) //capitalize drive letters
+				originPath = letter.toUpperCase()+originPath.slice(1);
+		}
 		const args = [
 			'-unlinked',
 			'-delay_cassert',
 			'-input', tmpInput,
+			'-force_ignore', originPath
 		];
 		if (settings.ignoreConstAssert)
 			args.push('-ignore_cassert');