Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved Java method synchronization from chat to source file #60

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Improved Java method synchronization from chat to source file #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<distributionUrl>https://github.com/jeddict/jeddict-ai</distributionUrl>
<codeNameBase>io.github.jeddict.jeddict.ai</codeNameBase>
<moduleDependencies>

<dependency>
<id>org.netbeans.api:org-netbeans-modules-editor-lib</id>
<type>impl</type>
Expand Down Expand Up @@ -218,7 +217,12 @@
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20240303</version>
</dependency>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-core</artifactId>
<version>3.26.2</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-editor-lib</artifactId>
Expand Down
201 changes: 195 additions & 6 deletions src/main/java/io/github/jeddict/ai/components/AssistantTopComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package io.github.jeddict.ai.components;

import com.github.javaparser.ast.CompilationUnit;
import static io.github.jeddict.ai.util.EditorUtil.getExtension;
import static io.github.jeddict.ai.util.EditorUtil.isSuitableForWebAppDirectory;
import static io.github.jeddict.ai.util.StringUtil.convertToCapitalized;
Expand All @@ -28,15 +29,19 @@
import java.awt.event.MouseEvent;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.prefs.Preferences;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.swing.BoxLayout;
import javax.swing.ImageIcon;
import javax.swing.JEditorPane;
import javax.swing.JFileChooser;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
Expand All @@ -47,9 +52,30 @@
import javax.swing.text.html.StyleSheet;
import org.netbeans.api.editor.mimelookup.MimeLookup;
import org.netbeans.api.editor.mimelookup.MimePath;
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.project.Project;
import com.github.javaparser.StaticJavaParser;
import com.github.javaparser.ast.body.MethodDeclaration;
import com.sun.source.tree.MethodTree;
import com.sun.source.util.TreePathScanner;
import java.util.List;
import java.util.stream.Collectors;
import javax.lang.model.element.Name;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import javax.swing.SwingUtilities;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.modules.editor.indent.api.Reformat;
import org.openide.awt.StatusDisplayer;
import org.openide.cookies.EditorCookie;
import org.openide.util.Exceptions;

import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.windows.TopComponent;

/**
*
* @author Shiwani Gupta
Expand All @@ -69,8 +95,6 @@ public class AssistantTopComponent extends TopComponent {
public static final ImageIcon newEditorIcon = new ImageIcon(AssistantTopComponent.class.getResource("/icons/newEditorIcon.png"));
public static final ImageIcon attachIcon = new ImageIcon(AssistantTopComponent.class.getResource("/icons/attachIcon.gif"));
public static final ImageIcon settingsIcon = new ImageIcon(AssistantTopComponent.class.getResource("/icons/settingsIcon.png"));



public static final String PREFERENCE_KEY = "AssistantTopComponentOpen";
private final JPanel parentPanel;
Expand All @@ -95,6 +119,7 @@ public AssistantTopComponent(String name, String type, Project project) {

public void clear() {
parentPanel.removeAll();
menus.clear();
}

public JEditorPane createHtmlPane(String content) {
Expand All @@ -115,7 +140,7 @@ public JEditorPane createHtmlPane(String content) {
parentPanel.add(editorPane);
return editorPane;
}

public JEditorPane createPane() {
JEditorPane editorPane = new JEditorPane();
editorPane.setEditable(false);
Expand Down Expand Up @@ -144,9 +169,13 @@ public JEditorPane createCodePane(String mimeType, String content) {
return editorPane;
}

private final Map<JEditorPane, JPopupMenu> menus = new HashMap<>();
private final Map<JEditorPane, List<JMenuItem>> menuItems = new HashMap<>();

private void addContextMenu(JEditorPane editorPane) {
JPopupMenu contextMenu = new JPopupMenu();

menus.put(editorPane, contextMenu);
menuItems.clear();
JMenuItem copyItem = new JMenuItem("Copy");
copyItem.addActionListener(e -> {
if (editorPane.getSelectedText() != null) {
Expand Down Expand Up @@ -342,6 +371,166 @@ public int getAllCodeEditorCount() {
return count;
}

public int getParseCodeEditor(List<FileObject> fileObjects) {
Map<JEditorPane, Map<String, String>> editorMethodCache = new HashMap<>();
for (FileObject fileObject : fileObjects) {
try (InputStream stream = fileObject.getInputStream()) {
String content = new String(stream.readAllBytes(), StandardCharsets.UTF_8);
CompilationUnit cu = StaticJavaParser.parse(content);
List<MethodDeclaration> methods = cu.findAll(MethodDeclaration.class);
Set<String> fileMethodSignatures = methods.stream()
.map(method -> method.getNameAsString() + "("
+ method.getParameters().stream()
.map(param -> param.getType().asString())
.collect(Collectors.joining(",")) + ")")
.collect(Collectors.toSet());

for (int i = 0; i < parentPanel.getComponentCount(); i++) {
if (parentPanel.getComponent(i) instanceof JEditorPane) {
JEditorPane editorPane = (JEditorPane) parentPanel.getComponent(i);
if (editorPane.getEditorKit().getContentType().equals("text/x-java")) {

Map<String, String> cachedMethodSignatures = editorMethodCache.computeIfAbsent(editorPane, ep -> {
Map<String, String> methodSignatures = new HashMap<>();
try {
MethodDeclaration editorMethod = StaticJavaParser.parseMethodDeclaration(editorPane.getText());
String signature = editorMethod.getNameAsString() + "("
+ editorMethod.getParameters().stream()
.map(param -> param.getType().asString())
.collect(Collectors.joining(",")) + ")";
methodSignatures.put(signature, editorPane.getText());
} catch (Exception e) {
CompilationUnit edCu = StaticJavaParser.parse("class Tmp {" + editorPane.getText() + "}");
List<MethodDeclaration> edMethods = edCu.findAll(MethodDeclaration.class);
for (MethodDeclaration edMethod : edMethods) {
String signature = edMethod.getNameAsString() + "("
+ edMethod.getParameters().stream()
.map(param -> param.getType().asString())
.collect(Collectors.joining(",")) + ")";
methodSignatures.put(signature, edMethod.toString());
}
}
return methodSignatures;
});

try {
for (String signature : fileMethodSignatures) {
if (cachedMethodSignatures.get(signature) != null) {
JMenuItem methodItem = new JMenuItem("Update " + signature + " in " + fileObject.getName());
methodItem.addActionListener(e -> {
SwingUtilities.invokeLater(() -> {
updateMethodInSource(fileObject, signature, cachedMethodSignatures.get(signature));
});
});
if (menuItems.get(editorPane) == null) {
menuItems.put(editorPane, new ArrayList<>());
}
menuItems.get(editorPane).add(methodItem);
}
}
} catch (Exception e) {
System.out.println("Error parsing single method declaration from editor content: " + e.getMessage());
}
}
}
}
} catch (Exception e) {
System.out.println("Error parsing file: " + fileObject.getName() + " - " + e.getMessage());
}
}

for (Map.Entry<JEditorPane, List<JMenuItem>> entry : menuItems.entrySet()) {
if (entry.getValue().size() > 3) {
JMenu methodMenu = new JMenu("Methods");
for (JMenuItem jMenuItem : entry.getValue()) {
methodMenu.add(jMenuItem);
}
menus.get(entry.getKey()).add(methodMenu);
} else {
JPopupMenu mainMenu = menus.get(entry.getKey());
for (JMenuItem jMenuItem : entry.getValue()) {
mainMenu.add(jMenuItem);
}
}
}
return 0;
}
private void updateMethodInSource(FileObject fileObject, String sourceMethodSignature, String methodContent) {
JavaSource javaSource = JavaSource.forFileObject(fileObject);
try {
javaSource.runModificationTask(copy -> {
copy.toPhase(JavaSource.Phase.RESOLVED);
new TreePathScanner<Void, Void>() {
@Override
public Void visitMethod(MethodTree methodTree, Void v) {
Name name = methodTree.getName();
String targetMethodSignature = name.toString() + "("
+ methodTree.getParameters().stream()
.map(param -> param.getType().toString())
.collect(Collectors.joining(",")) + ")";

// Compare the signature with the method being updated
if (targetMethodSignature.equals(sourceMethodSignature)) {
long startPos = copy.getTrees().getSourcePositions().getStartPosition(copy.getCompilationUnit(), methodTree);
long endPos = copy.getTrees().getSourcePositions().getEndPosition(copy.getCompilationUnit(), methodTree);

try {
if (copy.getDocument() == null) {
openFileInEditor(fileObject);
}
insertAndReformat(copy.getDocument(), methodContent, (int) startPos, (int) endPos - (int) startPos);
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
}
}
return super.visitMethod(methodTree, v);
}
}.scan(copy.getCompilationUnit(), null);

}).commit();
} catch (IOException e) {
System.out.println("Error updating method " + sourceMethodSignature + " in file " + fileObject.getName() + ": " + e.getMessage());
}
}


public void openFileInEditor(FileObject fileObject) {
try {
// Get the DataObject associated with the FileObject
DataObject dataObject = DataObject.find(fileObject);

// Lookup for the EditorCookie from the DataObject
EditorCookie editorCookie = dataObject.getLookup().lookup(EditorCookie.class);

if (editorCookie != null) {
// Open the file in the editor
editorCookie.open();
StatusDisplayer.getDefault().setStatusText("File opened in editor: " + fileObject.getNameExt());
} else {
StatusDisplayer.getDefault().setStatusText("Failed to find EditorCookie for file: " + fileObject.getNameExt());
}
} catch (DataObjectNotFoundException e) {
e.printStackTrace();
}
}
private void insertAndReformat(Document document, String content, int startPosition, int lengthToRemove) {
try {
if (lengthToRemove > 0) {
document.remove(startPosition, lengthToRemove);
}
document.insertString(startPosition, content, null);
Reformat reformat = Reformat.get(document);
reformat.lock();
try {
reformat.reformat(startPosition, startPosition + content.length());
} finally {
reformat.unlock();
}
} catch (BadLocationException ex) {
Exceptions.printStackTrace(ex);
}
}

public int getAllEditorCount() {
int count = 0;
for (int i = 0; i < parentPanel.getComponentCount(); i++) {
Expand Down
Loading
Loading