Skip to content

Commit b787c74

Browse files
committed
Restore launch shortcuts for HTML and JS
Fix the content type ids to TM4E ones
1 parent 273c1f6 commit b787c74

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/IsNodeProjectPropertyTester.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626

2727
public class IsNodeProjectPropertyTester extends PropertyTester {
2828

29+
public static final String JAVASCRIPT_CONTENT_TYPE = "org.eclipse.tm4e.language_pack.javascript";
30+
public static final String TYPESCRIPT_CONTENT_TYPE = "org.eclipse.tm4e.language_pack.typescript";
31+
2932
private static final String IS_NODE_RESOURCE_PROPERTY = "isNodeResource"; //$NON-NLS-1$
3033

3134
@Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
@@ -36,8 +39,8 @@ public class IsNodeProjectPropertyTester extends PropertyTester {
3639
}
3740
if (resource instanceof IFile file) {
3841
IContentTypeManager contentTypeManager = Platform.getContentTypeManager();
39-
IContentType jsContentType = contentTypeManager.getContentType("org.eclipse.wildwebdeveloper.js");
40-
IContentType tsContentType = contentTypeManager.getContentType("org.eclipse.wildwebdeveloper.ts");
42+
IContentType jsContentType = contentTypeManager.getContentType(JAVASCRIPT_CONTENT_TYPE);
43+
IContentType tsContentType = contentTypeManager.getContentType(TYPESCRIPT_CONTENT_TYPE);
4144
try (
4245
InputStream content = file.getContents();
4346
) {

org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/AbstractHTMLDebugAdapterLaunchShortcut.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
import org.eclipse.core.resources.IResource;
1414
import org.eclipse.core.runtime.Adapters;
1515
import org.eclipse.core.runtime.CoreException;
16+
import org.eclipse.wildwebdeveloper.html.HTMLLanguageServer;
1617

1718
public abstract class AbstractHTMLDebugAdapterLaunchShortcut extends AbstractDebugAdapterLaunchShortcut {
1819

1920
public AbstractHTMLDebugAdapterLaunchShortcut(String launchConfigTypeId) {
20-
super(launchConfigTypeId, "org.eclipse.wildwebdeveloper.html", true);
21+
super(launchConfigTypeId, HTMLLanguageServer.HTML_LANGUAGE_SERVER_ID, true);
2122
}
2223

2324
@Override

org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/node/NodeRunDebugLaunchShortcut.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
import org.eclipse.core.resources.IResource;
1919
import org.eclipse.core.runtime.CoreException;
2020
import org.eclipse.core.runtime.ILog;
21+
import org.eclipse.wildwebdeveloper.IsNodeProjectPropertyTester;
2122
import org.eclipse.wildwebdeveloper.debug.AbstractDebugAdapterLaunchShortcut;
2223

2324
public class NodeRunDebugLaunchShortcut extends AbstractDebugAdapterLaunchShortcut {
2425

2526
public NodeRunDebugLaunchShortcut() {
26-
super(NodeRunDAPDebugDelegate.ID, new String[] {"org.eclipse.tm4e.language_pack.javascript", "org.eclipse.tm4e.language_pack.typescript"}, true);
27+
super(NodeRunDAPDebugDelegate.ID, new String[] {IsNodeProjectPropertyTester.JAVASCRIPT_CONTENT_TYPE, IsNodeProjectPropertyTester.TYPESCRIPT_CONTENT_TYPE}, true);
2728
}
2829

2930
@Override

org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/html/HTMLLanguageServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
*/
3434
public class HTMLLanguageServer extends ProcessStreamConnectionProviderWithPreference {
3535

36-
private static final String HTML_LANGUAGE_SERVER_ID = "org.eclipse.wildwebdeveloper.html";
36+
public static final String HTML_LANGUAGE_SERVER_ID = "org.eclipse.tm4e.language_pack.html";
3737

3838
private static final String[] SUPPORTED_SECTIONS = { "html", "css", "javascript" };
3939

0 commit comments

Comments
 (0)