Disable the keybinding of formatting document #272

snjeza · 2017-06-24T20:11:01Z

Signed-off-by: Snjezana Peco snjezana.peco@redhat.com

See follow up: redhat-developer/vscode-java#245

fbricon · 2017-06-26T14:44:52Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java

@@ -45,7 +50,8 @@

 	private Severity incompleteClasspathSeverity;
 	private FeatureStatus updateBuildConfigurationStatus;
-	private boolean referencesCodeLensEnabled;
+	private boolean referencesCodeLensEnabled = true;
+	private boolean javaFormatEnable = true;


javaFormatEnabled

fbricon · 2017-06-26T14:53:10Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java

@@ -133,6 +144,11 @@ private Preferences setReferencesCodelensEnabled(boolean enabled) {
 		return this;
 	}

+	public Preferences setJavaFormatEnable(boolean enable) {


setJavaFormatEnabled

fbricon · 2017-06-26T14:53:20Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java

@@ -155,6 +171,10 @@ public boolean isReferencesCodeLensEnabled() {
 		return referencesCodeLensEnabled;
 	}

+	public boolean isJavaFormatEnable() {


isJavaFormatEnabled

fbricon · 2017-06-26T15:00:08Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java

@@ -28,6 +28,11 @@
 	public static final String REFERENCES_CODE_LENS_ENABLED_KEY = "java.referencesCodeLens.enabled";

 	/**
+	 * Preference key to enable/disable formatter.
+	 */
+	public static final String JAVA_FORMAT_ENABLE_KEY = "java.format.enable";


so I think we need to be consistent with ourselves here, even if we break consistency with vscode and its javascript.referencesCodeLens.enabled vs javascript.format.enable pref keys. So I'd use java.format.enabled instead

fbricon

@snjeza the server needs to register/unregister formatting capabilities, as discussed in this thread

snjeza · 2017-06-28T21:00:18Z

The PR uses the client/registerFeature message because the client/registerCapability message doesn't work.
See microsoft/vscode-languageserver-node#199
The HTML and JSON LS also use the client/registerFeature message.

fbricon · 2017-06-28T21:50:23Z

The latest vscode-languageclient correctly uses client/registerCapability (my version in nodes_modules is 3.2.2), That's what should be used

fbricon · 2017-06-30T14:12:58Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/InitHandler.java

@@ -90,8 +90,8 @@ InitializeResult initialize(InitializeParams param){
 		capabilities.setWorkspaceSymbolProvider(Boolean.TRUE);
 		capabilities.setReferencesProvider(Boolean.TRUE);
 		capabilities.setDocumentHighlightProvider(Boolean.TRUE);
-		capabilities.setDocumentFormattingProvider(Boolean.TRUE);
-		capabilities.setDocumentRangeFormattingProvider(Boolean.TRUE);
+		//		capabilities.setDocumentFormattingProvider(Boolean.TRUE);


the capabilities should be set during init, if the client doesn't support dynamic capabilities

fbricon · 2017-06-30T14:23:06Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java

@@ -176,6 +181,25 @@ public void didChangeConfiguration(DidChangeConfigurationParams params) {
 			Preferences prefs = Preferences.createFrom(javaConfig);
 			preferenceManager.update(prefs);
 		}
+		if (!preferenceManager.getPreferences().isJavaFormatEnabled()) {
+			Unregistration unregistration = new Unregistration(Preferences.FORMATTING_ID, Preferences.TEXT_DOCUMENT_FORMATTING);


should check if dynamic registration of formatting capabilities is available.

in ClientPreferences, new method should check if v3Supported and capabilities.getTextDocument().getFormatting().getDynamicRegistration() is true

fbricon · 2017-06-30T14:23:44Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java

+			Unregistration unregistration = new Unregistration(Preferences.FORMATTING_ID, Preferences.TEXT_DOCUMENT_FORMATTING);
+			List<Unregistration> unregistrations = new ArrayList<>();
+			unregistrations.add(unregistration);
+			unregistration = new Unregistration(Preferences.FORMATTING_RANGE_ID, Preferences.TEXT_DOCUMENT_RANGE_FORMATTING);


should check if dynamic registration of range formatting capabilities are available.

in ClientPreferences, new method should check if v3Supported and capabilities.getTextDocument().getRangeFormatting().getDynamicRegistration() is true

fbricon · 2017-06-30T14:24:36Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java

+			UnregistrationParams unregistrationParams = new UnregistrationParams(unregistrations);
+			client.unregisterFeature(unregistrationParams);
+			// client.unregisterCapability(unregistrationParams);
+		} else {


need same checks

fbricon · 2017-07-03T18:33:45Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JavaClientConnection.java

@@ -43,6 +47,12 @@
 		 */
 		@JsonNotification("language/actionableNotification")
 		void sendActionableNotification(ActionableNotification notification);
+
+		@JsonRequest("client/unregisterFeature")
+		CompletableFuture<Void> unregisterFeature(UnregistrationParams params);


unnecessary new method. please remove it.

fbricon · 2017-07-03T18:33:53Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JavaClientConnection.java

+		CompletableFuture<Void> unregisterFeature(UnregistrationParams params);
+
+		@JsonRequest("client/registerFeature")
+		CompletableFuture<Void> registerFeature(RegistrationParams params);


unnecessary new method. please remove it.

fbricon · 2017-07-03T18:34:01Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JavaClientConnection.java

+	 * register a new feature handler on the client side.
+	 */
+	@JsonRequest("client/registerFeature")
+	public void registerFeature(RegistrationParams params) {


unnecessary new method. please remove it.

fbricon · 2017-07-03T18:34:05Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JavaClientConnection.java

+	 * to register a new feature handler on the client side.
+	 */
+	@JsonRequest("client/unregisterFeature")
+	public void unregisterFeature(UnregistrationParams params) {


unnecessary new method. please remove it.

fbricon · 2017-07-03T18:34:34Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java

+				List<Unregistration> unregistrations = new ArrayList<>();
+				unregistrations.add(unregistration);
+				UnregistrationParams unregistrationParams = new UnregistrationParams(unregistrations);
+				client.unregisterFeature(unregistrationParams);


use client.unregisterCapability

fbricon · 2017-07-03T18:34:48Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java

+				Unregistration unregistration = new Unregistration(Preferences.FORMATTING_RANGE_ID, Preferences.TEXT_DOCUMENT_RANGE_FORMATTING);
+				unregistrations.add(unregistration);
+				UnregistrationParams unregistrationParams = new UnregistrationParams(unregistrations);
+				client.unregisterFeature(unregistrationParams);


use client.unregisterCapability

fbricon · 2017-07-03T18:35:02Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java

+				List<Registration> registrations = new ArrayList<>();
+				registrations.add(registration);
+				RegistrationParams registrationParams = new RegistrationParams(registrations);
+				client.registerFeature(registrationParams);


use client.registerCapability

fbricon · 2017-07-03T18:35:10Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java

+				Registration registration = new Registration(Preferences.FORMATTING_RANGE_ID, Preferences.TEXT_DOCUMENT_RANGE_FORMATTING);
+				registrations.add(registration);
+				RegistrationParams registrationParams = new RegistrationParams(registrations);
+				client.registerFeature(registrationParams);


use client.registerCapability

fbricon · 2017-07-03T18:37:36Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JavaClientConnection.java

+	 * @see {@link org.eclipse.lsp4j.services.LanguageClient#unregisterCapability(RegistrationParams)}
+	 */
+	public void unregisterCapability(UnregistrationParams params) {
+		client.unregisterCapability(params).join();


don't join, that makes the server unresponsive, waiting for a response that never comes.

fbricon · 2017-07-03T18:40:06Z

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JavaClientConnection.java

+	 * @see {@link org.eclipse.lsp4j.services.LanguageClient#registerCapability(RegistrationParams)}
+	 */
+	public void registerCapability(RegistrationParams params) {
+		client.registerCapability(params).join();


don't join, that makes the server unresponsive, waiting for a response that never comes.

"pool-1-thread-1" #24 prio=5 os_prio=31 tid=0x00007f9926366800 nid=0xb303 waiting on condition [0x0000700009406000] java.lang.Thread.State: WAITING (parking) at sun.misc.Unsafe.park(Native Method) - parking to wait for <0x000000078120e1f0> (a java.util.concurrent.CompletableFuture$Signaller) at java.util.concurrent.locks.LockSupport.park(LockSupport.java:175) at java.util.concurrent.CompletableFuture$Signaller.block(CompletableFuture.java:1693) at java.util.concurrent.ForkJoinPool.managedBlock(ForkJoinPool.java:3323) at java.util.concurrent.CompletableFuture.waitingGet(CompletableFuture.java:1729) at java.util.concurrent.CompletableFuture.join(CompletableFuture.java:1934) at org.eclipse.jdt.ls.core.internal.JavaClientConnection.registerCapability(JavaClientConnection.java:156) at org.eclipse.jdt.ls.core.internal.handlers.JDTLanguageServer.didChangeConfiguration(JDTLanguageServer.java:197)

Not sure if this is a bug in LSP4J, i.e. maybe registerCapability should return a Future. cc @akosyakov @spoenemann

Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>

fbricon · 2017-07-04T15:10:37Z

Looks good now, thanks @snjeza.

I'll wait for the current vscode-java release to complete before merging

gorkem added the in progress label Jun 24, 2017

snjeza mentioned this pull request Jun 24, 2017

Disable the keybinding of formatting document redhat-developer/vscode-java#245

Merged

snjeza requested review from gorkem and fbricon June 24, 2017 20:12

fbricon reviewed Jun 26, 2017

View reviewed changes

snjeza force-pushed the issue-186 branch from 69dbd51 to 00923cd Compare June 26, 2017 15:05

fbricon requested changes Jun 27, 2017

View reviewed changes

snjeza force-pushed the issue-186 branch from 00923cd to 1a2f4b3 Compare June 28, 2017 20:57

snjeza force-pushed the issue-186 branch from 1a2f4b3 to 8c7ae42 Compare June 28, 2017 21:16

fbricon reviewed Jun 30, 2017

View reviewed changes

snjeza force-pushed the issue-186 branch from 8c7ae42 to e23aa17 Compare June 30, 2017 18:31

fbricon added this to the End July 2017 milestone Jul 3, 2017

fbricon requested changes Jul 3, 2017

View reviewed changes

snjeza force-pushed the issue-186 branch from e23aa17 to 9473d61 Compare July 3, 2017 21:49

Disable the keybinding of formatting document

2285803

Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>

snjeza force-pushed the issue-186 branch from 9473d61 to 2285803 Compare July 3, 2017 21:57

fbricon approved these changes Jul 4, 2017

View reviewed changes

fbricon merged commit 33eacd2 into eclipse-jdtls:master Jul 4, 2017

fbricon removed the in progress label Jul 4, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Disable the keybinding of formatting document #272

Disable the keybinding of formatting document #272

snjeza commented Jun 24, 2017 •

edited by fbricon

Loading

fbricon Jun 26, 2017

fbricon Jun 26, 2017

fbricon Jun 26, 2017

fbricon Jun 26, 2017

fbricon left a comment

snjeza commented Jun 28, 2017

fbricon commented Jun 28, 2017

fbricon Jun 30, 2017

fbricon Jun 30, 2017

fbricon Jun 30, 2017 •

edited

Loading

fbricon Jun 30, 2017

fbricon Jul 3, 2017

fbricon Jul 3, 2017

fbricon Jul 3, 2017

fbricon Jul 3, 2017

fbricon Jul 3, 2017

fbricon Jul 3, 2017

fbricon Jul 3, 2017

fbricon Jul 3, 2017

fbricon Jul 3, 2017

fbricon Jul 3, 2017

fbricon commented Jul 4, 2017

Disable the keybinding of formatting document #272

Disable the keybinding of formatting document #272

Conversation

snjeza commented Jun 24, 2017 • edited by fbricon Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fbricon left a comment

Choose a reason for hiding this comment

snjeza commented Jun 28, 2017

fbricon commented Jun 28, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fbricon Jun 30, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fbricon commented Jul 4, 2017

snjeza commented Jun 24, 2017 •

edited by fbricon

Loading

fbricon Jun 30, 2017 •

edited

Loading