Fix Docstring Context Extraction And Add JSON Contains Alias

Improve docstring generation by gathering a safer text range from the current symbol. When the symbol spans a single line, the full line is now used directly; for multi-line symbols, the range includes the complete ending line. An explicit warning is shown and generation is aborted if no usable context can be collected.

Also add a clearer JSON object membership API via `JSONItem::contains`, with `hasNamedObject` preserved as a thin alias for compatibility. While touching the JSON helpers, the membership lookup now uses a UTF-8 string conversion path that matches the underlying cJSON call more directly.

* AI docstring generation
* JSON utilities

**Generated by CodeLite**

Signed-off-by: Eran Ifrah <eran@codelite.org>

Author: eranif

CodeLite/JSON.cpp

@@ -29,10 +29,7 @@
 
 #include <wx/filename.h>
 
-JSON::JSON(const wxString& text)
-{
-    m_json = cJSON_Parse(text.mb_str(wxConvUTF8).data());
-}
+JSON::JSON(const wxString& text) { m_json = cJSON_Parse(text.mb_str(wxConvUTF8).data()); }
 
 JSON::JSON(JsonType type)
 {
@@ -413,15 +410,16 @@ wxArrayString JSONItem::toArrayString(const wxArrayString& defaultValue) const
     return arr;
 }
 
-bool JSONItem::hasNamedObject(const wxString& name) const
+bool JSONItem::contains(const wxString& name) const
 {
     if (!m_json) {
         return false;
     }
 
-    cJSON* obj = cJSON_GetObjectItem(m_json, name.mb_str(wxConvUTF8).data());
-    return obj != nullptr;
+    std::string name_cstr = name.ToStdString(wxConvUTF8);
+    return cJSON_GetObjectItem(m_json, name_cstr.c_str()) != nullptr;
 }
+
 #if wxUSE_GUI
 
 JSONItem& JSONItem::addProperty(const wxString& name, const wxSize& sz)

CodeLite/JSON.h

@@ -60,7 +60,18 @@ class WXDLLIMPEXP_CL JSONItem
     // Readers
     ////////////////////////////////////////////////
     JSONItem namedObject(const wxString& name) const;
-    bool hasNamedObject(const wxString& name) const;
+    /**
+     * @brief Checks whether this JSON object contains a member with the specified name.
+     *
+     * @param name wxString The name of the member to search for in the JSON object.
+     * @return bool true if the object contains a member with the given name; otherwise false.
+     */
+    bool contains(const wxString& name) const;
+
+    /**
+     * @brief An alias to the `contains` method above.
+     */
+    bool hasNamedObject(const wxString& name) const { return contains(name); }
 
     /// If your array is big (hundred of entries) use
     /// `GetAsVector` and iterate it instead

Plugin/ai/LLMManager.cpp

@@ -1343,9 +1343,24 @@ void Manager::OnGenerateDocString(wxCommandEvent& event)
         return;
     }
 
-    int start_pos = stc->PositionFromLine(symbol_range.value().start_line - 1);
-    int end_pos = stc->PositionFromLine(symbol_range.value().end_line.value_or(stc->GetLineCount()) - 1);
-    wxString func_text = stc->GetTextRange(start_pos, end_pos);
+    int start_line = symbol_range.value().start_line - 1;
+    int end_line = symbol_range.value().end_line.value_or(stc->GetLineCount()) - 1;
+
+    wxString func_text;
+    if (start_line == end_line) {
+        // take the entire line
+        func_text = stc->GetLine(start_line);
+    } else {
+        // Take everything between the start and end line.
+        int start_pos = stc->PositionFromLine(start_line);
+        int end_pos = stc->PositionFromLine(end_line) + stc->LineLength(end_line);
+        func_text = stc->GetTextRange(start_pos, end_pos);
+    }
+
+    if (func_text.empty()) {
+        ::clMessageBox(_("Unable to gather enough context to generate docstring"), "CodeLite", wxOK | wxICON_WARNING);
+        return;
+    }
 
     clGetManager()->SetStatusMessage(_("Generating DocString..."), 1);
     wxString prompt = GetConfig().GetPrompt(llm::PromptKind::kCommentGeneration);