Vulkan: Ensure autocomplete recognizes leading tabs in the shader syntax

JKSunny · Oct 14, 2024 · 8e6c6f2 · 8e6c6f2
1 parent 7a69fe6
commit 8e6c6f2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/codemp/rd-vulkan/utils/ImGuiColorTextEdit/TextEditor.cpp b/codemp/rd-vulkan/utils/ImGuiColorTextEdit/TextEditor.cpp
@@ -954,7 +954,7 @@ void TextEditor::AutoComplete( void )
 	if ( mTextChangedDelayed ) 
 	{
 		uint32_t i;
-		std::string selectedText = GetCurrentLineText();
+		std::string selectedText = GetCurrentLineText( true );
 
 		AutoCompleteListClear();
 
@@ -2777,11 +2777,27 @@ std::string TextEditor::GetSelectedText() const
 	return GetText(mState.mSelectionStart, mState.mSelectionEnd);
 }
 
-std::string TextEditor::GetCurrentLineText()const
+std::string TextEditor::GetCurrentLineText( bool ignoreLeadingSpace ) const
 {
 	auto lineLength = GetLineMaxColumn(mState.mCursorPosition.mLine);
+
+	int start = 0;
+
+	if ( ignoreLeadingSpace ) 
+	{
+		auto& line = mLines[mState.mCursorPosition.mLine];
+
+		while ( start < line.size() && isspace( line[start].mChar ) )
+			start++;
+
+		if ( start >= line.size() )
+			return "";
+
+		start = GetCharacterColumn( mState.mCursorPosition.mLine, start );
+	}
+
 	return GetText(
-		Coordinates(mState.mCursorPosition.mLine, 0),
+		Coordinates(mState.mCursorPosition.mLine, start ),
 		Coordinates(mState.mCursorPosition.mLine, lineLength));
 }
 

diff --git a/codemp/rd-vulkan/utils/ImGuiColorTextEdit/TextEditor.h b/codemp/rd-vulkan/utils/ImGuiColorTextEdit/TextEditor.h
@@ -237,7 +237,7 @@ class TextEditor
 	std::vector<std::string> GetTextLines() const;
 
 	std::string GetSelectedText() const;
-	std::string GetCurrentLineText()const;
+	std::string GetCurrentLineText( bool ignoreLeadingSpace = false ) const;
 
 	int GetTotalLines() const { return (int)mLines.size(); }
 	bool IsOverwrite() const { return mOverwrite; }