fix lint error
This commit is contained in:
bobo
parent
d8d1c34406
commit
8a15ea83f2
@ -152,12 +152,12 @@ class IDEService:
|
||||
if self.ide_name() == "vscode":
|
||||
return selected_range()
|
||||
return IdeaIDEService().get_selected_range()
|
||||
|
||||
|
||||
@rpc_method
|
||||
def get_diagnostics_in_range(self, fileName: str, startLine: int, endLine: int) -> List[str]:
|
||||
"""
|
||||
Retrieves diagnostics for a specific range of code in the current IDE.
|
||||
|
||||
|
||||
Returns:
|
||||
A list of diagnostic messages for the specified range.
|
||||
"""
|
||||
@ -172,7 +172,7 @@ class IDEService:
|
||||
The collapsed code.
|
||||
"""
|
||||
return self._result
|
||||
|
||||
|
||||
@rpc_method
|
||||
def get_extension_tools_path(self) -> str:
|
||||
"""
|
||||
@ -182,4 +182,3 @@ class IDEService:
|
||||
The extension tools path.
|
||||
"""
|
||||
return self._result
|
||||
|
||||
|
||||
@ -3,161 +3,9 @@ import re
|
||||
import sys
|
||||
|
||||
from devchat.llm import chat
|
||||
from devchat.memory import FixSizeChatMemory
|
||||
|
||||
from lib.ide_service import IDEService
|
||||
|
||||
PROMPT = prompt = """
|
||||
file: {file_path}
|
||||
```
|
||||
{selected_text}
|
||||
```
|
||||
"""
|
||||
|
||||
PROMPT_ZH = prompt = """
|
||||
文件: {file_path}
|
||||
```
|
||||
{selected_text}
|
||||
```
|
||||
|
||||
输出内容使用中文，我的母语为中文。
|
||||
"""
|
||||
|
||||
|
||||
def get_prompt():
|
||||
ide_language = IDEService().ide_language()
|
||||
return PROMPT_ZH if ide_language == "zh" else PROMPT
|
||||
|
||||
|
||||
MESSAGES_A = [
|
||||
{
|
||||
"role": "system",
|
||||
"content": """
|
||||
Your task is:
|
||||
Write a documentation comment to the selected code. Please pay attention to using \
|
||||
standard comment format, such as method comments, please explain parameters and return values. \
|
||||
And just add the documents for the selected portion of the code.
|
||||
Output documentation comment is format as code block.\
|
||||
|
||||
You must follow the following rules:
|
||||
1. Output documentation comment in ```comment <documentation comments without code lines> ``` \
|
||||
format.
|
||||
2. Different languages have different comment symbols, please choose the correct comment symbol \
|
||||
according to the file name.
|
||||
3. You must output ... to indicate the remaining code, output all code block can make more errors.
|
||||
""",
|
||||
},
|
||||
{
|
||||
"role": "user",
|
||||
"content": """
|
||||
file: a1.py
|
||||
```
|
||||
def print_hello():
|
||||
print("hello")
|
||||
print("world")
|
||||
```
|
||||
""",
|
||||
},
|
||||
{
|
||||
"role": "assistant",
|
||||
"content": """
|
||||
```comment
|
||||
def print_hello():
|
||||
\"\"\"
|
||||
print hello
|
||||
|
||||
Parameters:
|
||||
None
|
||||
|
||||
Returns:
|
||||
None
|
||||
\"\"\"
|
||||
print("hello")
|
||||
...
|
||||
```
|
||||
""",
|
||||
},
|
||||
{
|
||||
"role": "user",
|
||||
"content": """
|
||||
file: t1.java
|
||||
```
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello, World!");
|
||||
}
|
||||
```
|
||||
""",
|
||||
},
|
||||
{
|
||||
"role": "assistant",
|
||||
"content": """
|
||||
```comment
|
||||
/**
|
||||
* The main method is the entry point of the program.
|
||||
* This method prints "Hello, World!" to the console.
|
||||
*
|
||||
* @param args command line arguments (not used in this program)
|
||||
*/
|
||||
public static void main(String[] args) {
|
||||
...
|
||||
```
|
||||
""",
|
||||
},
|
||||
{
|
||||
"role": "user",
|
||||
"content": """
|
||||
file: t1.py
|
||||
```
|
||||
def content_to_json(content):
|
||||
try:
|
||||
content_no_block = _try_remove_markdown_block_flag(content)
|
||||
response_obj = json.loads(content_no_block)
|
||||
return response_obj
|
||||
except json.JSONDecodeError as err:
|
||||
raise RetryException(err) from err
|
||||
except Exception as err:
|
||||
raise err
|
||||
```
|
||||
""",
|
||||
},
|
||||
{
|
||||
"role": "assistant",
|
||||
"content": """
|
||||
```comment
|
||||
def content_to_json(content):
|
||||
\"\"\"
|
||||
Convert the given content to a JSON object.
|
||||
|
||||
Parameters:
|
||||
content (str): The content to convert.
|
||||
|
||||
Returns:
|
||||
dict: The JSON object.
|
||||
|
||||
Raises:
|
||||
RetryException: If the content cannot be decoded to JSON.
|
||||
\"\"\"
|
||||
try:
|
||||
...
|
||||
```
|
||||
""",
|
||||
},
|
||||
]
|
||||
|
||||
|
||||
|
||||
|
||||
memory = FixSizeChatMemory(max_size=20, messages=MESSAGES_A)
|
||||
|
||||
|
||||
@chat(prompt=get_prompt(), stream_out=True, memory=memory)
|
||||
# pylint: disable=unused-argument
|
||||
def add_docstring(selected_text, file_path):
|
||||
"""
|
||||
call ai to rewrite selected code
|
||||
"""
|
||||
pass # pylint: disable=unnecessary-pass
|
||||
|
||||
|
||||
def extract_markdown_block(text):
|
||||
"""
|
||||
@ -178,123 +26,6 @@ def extract_markdown_block(text):
|
||||
return None
|
||||
return text
|
||||
|
||||
|
||||
def get_indent_level(text):
|
||||
"""
|
||||
Returns the indentation level of the given text.
|
||||
|
||||
:param text: A string containing the text to be analyzed
|
||||
:return: The indentation level of the text, as an integer
|
||||
"""
|
||||
indent_level = 0
|
||||
for char in text:
|
||||
if char == " ":
|
||||
indent_level += 1
|
||||
elif char == "\t":
|
||||
indent_level += 4
|
||||
else:
|
||||
break
|
||||
return indent_level
|
||||
|
||||
|
||||
def offset_indent_level(text, indent_level):
|
||||
"""
|
||||
Offsets the indentation level of the given text by the specified amount.
|
||||
|
||||
:param text: A string containing the text to be modified
|
||||
:param indent_level: The amount by which to offset the indentation level
|
||||
:return: The modified text with the indentation level offset
|
||||
"""
|
||||
current_indent = get_indent_level(text)
|
||||
offset_indent = indent_level - current_indent
|
||||
if offset_indent > 0:
|
||||
lines = text.splitlines()
|
||||
new_lines = []
|
||||
for line in lines:
|
||||
new_lines.append(" " * offset_indent + line)
|
||||
text = "\n".join(new_lines)
|
||||
return text
|
||||
|
||||
|
||||
def merge_code(selected_text, docstring):
|
||||
user_selected_lines = selected_text.split("\n")
|
||||
docstring_lines = docstring.split("\n")
|
||||
|
||||
user_selected_trim_lines = [line.replace(" ", "").strip() for line in user_selected_lines]
|
||||
docstring_trim_lines = [line.replace(" ", "").strip() for line in docstring_lines]
|
||||
|
||||
# match user_selected_trim_line == docstring_trim_line
|
||||
# and index_selected_line != index_docstring_line
|
||||
has_match = False
|
||||
for index, line in enumerate(user_selected_trim_lines):
|
||||
for index_doc, line_doc in enumerate(docstring_trim_lines):
|
||||
if line_doc == "..." and has_match:
|
||||
line_doc = line
|
||||
break
|
||||
if line == line_doc:
|
||||
has_match = True
|
||||
break
|
||||
if line != line_doc or index == index_doc:
|
||||
continue
|
||||
return "\n".join(docstring_lines[:index_doc] + user_selected_lines[index:])
|
||||
|
||||
# match with part of code
|
||||
for index, line in enumerate(user_selected_trim_lines):
|
||||
for index_doc, line_doc in enumerate(docstring_trim_lines):
|
||||
if line_doc == "...":
|
||||
break
|
||||
if (
|
||||
line.strip().find(line_doc.strip()) != -1
|
||||
or line_doc.strip().find(line.strip()) != -1
|
||||
):
|
||||
break
|
||||
if (
|
||||
line.strip().find(line_doc.strip()) == -1 and line_doc.strip().find(line.strip()) == -1
|
||||
) or index == index_doc:
|
||||
continue
|
||||
return "\n".join(docstring_lines[:index_doc] + user_selected_lines[index:])
|
||||
return docstring + "\n" + selected_text
|
||||
|
||||
|
||||
def main():
|
||||
# Prepare code
|
||||
selected_text = get_selected_code()
|
||||
|
||||
# Rewrite
|
||||
response = add_docstring(
|
||||
selected_text=selected_text.get("text", ""), file_path=selected_text.get("abspath", "")
|
||||
)
|
||||
if not response:
|
||||
sys.exit(1)
|
||||
|
||||
# Get indent level
|
||||
indent = get_indent_level(selected_text.get("text", ""))
|
||||
|
||||
# Apply new code to editor
|
||||
new_code = extract_markdown_block(response)
|
||||
if not new_code:
|
||||
language = IDEService().ide_language()
|
||||
print_message(language)
|
||||
sys.exit(0)
|
||||
|
||||
# Offset indent level
|
||||
new_code = offset_indent_level(new_code, indent)
|
||||
|
||||
# Merge code
|
||||
docstring_code = merge_code(selected_text.get("text", ""), new_code)
|
||||
# Apply diff
|
||||
IDEService().diff_apply("", docstring_code)
|
||||
|
||||
sys.exit(0)
|
||||
|
||||
|
||||
def print_message(language):
|
||||
if language == "zh":
|
||||
print("\n\n大模型输出不完整，不能进行代码操作。\n\n")
|
||||
else:
|
||||
print("\n\nThe output of the LLM is incomplete and cannot perform code operations.\n\n")
|
||||
|
||||
|
||||
# step 1 : get selected code
|
||||
def get_selected_code():
|
||||
selected_data = IDEService().get_selected_range().dict()
|
||||
@ -352,7 +83,6 @@ def get_current_file_content(file_path, issue_line_num):
|
||||
|
||||
# get issue description
|
||||
def get_rule_description(issue_description):
|
||||
# Remove 1 unexpected arguments; 'hello' expects 0 positional arguments. [+2 locations] <sonarlint:python:S930>
|
||||
def parse_source_code(text):
|
||||
pattern = r'<(\w+):(.+?)>'
|
||||
match = re.search(pattern, text)
|
||||
@ -399,9 +129,10 @@ def main():
|
||||
sys.exit(1)
|
||||
issue_description = input_issue_descriptions(file_path, issue_line_num)
|
||||
if not issue_description:
|
||||
print('There are no issues to resolve on the current line. Please select the line where an issue needs to be resolved.')
|
||||
print('There are no issues to resolve on the current line. '
|
||||
'Please select the line where an issue needs to be resolved.')
|
||||
sys.exit(0)
|
||||
|
||||
|
||||
print("make llm prompt ...\n\n")
|
||||
current_file_content = get_current_file_content(file_path, issue_line_num)
|
||||
rule_description = get_rule_description(issue_description)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user