Skip to content

Adjust volar AutoInsert protocol changes #1875

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

Merged
merged 1 commit into from
Jun 23, 2025
Merged

Adjust volar AutoInsert protocol changes #1875

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
27 changes: 0 additions & 27 deletions ...e.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/vue/autoinsert/AutoInsertOptions.java
View file
Open in desktop

This file was deleted.

20 changes: 10 additions & 10 deletions ...se.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/vue/autoinsert/AutoInsertParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ public class AutoInsertParams {
/**
* The position inside the text document.
*/
private Position position;
private Position selection;

private AutoInsertOptions options;
private AutoInsertLastChange change;


public TextDocumentIdentifier getTextDocument() {
Expand All @@ -41,20 +41,20 @@ public void setTextDocument(TextDocumentIdentifier textDocument) {
this.textDocument = textDocument;
}

public Position getPosition() {
return position;
public Position getSelection() {
return selection;
}

public void setPosition(Position position) {
this.position = position;
public void setSelection(Position selection) {
this.selection = selection;
}

public AutoInsertOptions getOptions() {
return options;
public AutoInsertLastChange getChange() {
return change;
}

public void setOptions(AutoInsertOptions options) {
this.options = options;
public void setChange(AutoInsertLastChange options) {
this.change = options;
}

}
8 changes: 3 additions & 5 deletions ...webdeveloper/src/org/eclipse/wildwebdeveloper/vue/autoinsert/VueAutoInsertReconciler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,16 @@ private void autoInsert(DocumentEvent event) {

AutoInsertParams params = new AutoInsertParams();
params.setTextDocument(identifier);
params.setPosition(LSPEclipseUtils.toPosition(offset + event.getText().length(), document));

AutoInsertOptions opts = new AutoInsertOptions();
params.setSelection(LSPEclipseUtils.toPosition(offset + event.getText().length(), document));

AutoInsertLastChange changeEvent = new AutoInsertLastChange();
final var range = new Range(LSPEclipseUtils.toPosition(offset, document),
LSPEclipseUtils.toPosition(offset + event.fLength, document));
changeEvent.setRange(range);
changeEvent.setText(event.getText());
changeEvent.setRangeLength(event.fLength);
changeEvent.setRangeOffset(offset);
opts.setLastChange(changeEvent);
params.setOptions(opts);
params.setChange(changeEvent);

// consumes String or AutoInsertResponse from Vue Server
info.autoInsert(params)
Expand Down
Loading