Skip to content

feat: make Code Lens/Formatter options of JSTS LangServer configurable #1960

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+762 −365
Open

feat: make Code Lens/Formatter options of JSTS LangServer configurable #1960

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
137 changes: 69 additions & 68 deletions org.eclipse.wildwebdeveloper/plugin.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,71 @@
#/*******************************************************************************
# * Copyright (c) 2022 Red Hat Inc. and others.
# * This program and the accompanying materials are made
# * available under the terms of the Eclipse Public License 2.0
# * which is available at https://www.eclipse.org/legal/epl-2.0/
# *
# * SPDX-License-Identifier: EPL-2.0
# *
# * Contributors:
# * Angelo ZERR (Red Hat Inc.) - initial implementation
# *******************************************************************************/
pluginName=Wild Web Developer: web development in Eclipse IDE
providerName=Eclipse Wild Web Developer project

# CSS, LESS, SCSS
CSSPreferencePage.name=CSS (Wild Web Developer)
CSSCompletionPreferencePage.name=Completion
CSSFormatPreferencePage.name=Format
CSSHoverPreferencePage.name=Hover
CSSValidationPreferencePage.name=Validation

LESSPreferencePage.name=LESS
LESSCompletionPreferencePage.name=Completion
LESSFormatPreferencePage.name=Format
LESSHoverPreferencePage.name=Hover
LESSValidationPreferencePage.name=Validation

SCSSPreferencePage.name=SCSS
SCSSCompletionPreferencePage.name=Completion
SCSSFormatPreferencePage.name=Format
SCSSHoverPreferencePage.name=Hover
SCSSValidationPreferencePage.name=Validation

# HTML
HTMLPreferencePage.name=HTML (Wild Web Developer)
HTMLCompletionPreferencePage.name=Completion
HTMLFormatPreferencePage.name=Format
HTMLHoverPreferencePage.name=Hover
HTMLValidationPreferencePage.name=Validation

# JST/TS
JSTSPreferencePage.name=JS/TS (Wild Web Developer)
TypeScriptPreferencePage.name=TypeScript
TypeScriptInlayHintPreferencePage.name=Inlay Hint
JavaScriptPreferencePage.name=JavaScript
JavaScriptInlayHintPreferencePage.name=Inlay Hint

# Markdown
MarkdownPreferencePage.name=Markdown (Wild Web Developer)
MarkdownProblem=Markdown Problem

# YAML
YAMLPreferencePage.name=YAML (Wild Web Developer)
YAMLCompletionPreferencePage.name=Completion
YAMLFormatPreferencePage.name=Format
YAMLHoverPreferencePage.name=Hover
YAMLValidationPreferencePage.name=Validation

# preference keywords
preferenceKeywords.yaml=yaml
preferenceKeywords.js=js
preferenceKeywords.ts=ts
preferenceKeywords.javascript=javascript
preferenceKeywords.typescript=typescript
preferenceKeywords.css=css
preferenceKeywords.less=less
preferenceKeywords.scss=scss
preferenceKeywords.sass=sass
#/*******************************************************************************
# * Copyright (c) 2022 Red Hat Inc. and others.
# * This program and the accompanying materials are made
# * available under the terms of the Eclipse Public License 2.0
# * which is available at https://www.eclipse.org/legal/epl-2.0/
# *
# * SPDX-License-Identifier: EPL-2.0
# *
# * Contributors:
# * Angelo ZERR (Red Hat Inc.) - initial implementation
# *******************************************************************************/
pluginName=Wild Web Developer: web development in Eclipse IDE
providerName=Eclipse Wild Web Developer project

# CSS, LESS, SCSS
CSSPreferencePage.name=CSS (Wild Web Developer)
CSSCompletionPreferencePage.name=Completion
CSSFormatPreferencePage.name=Format
CSSHoverPreferencePage.name=Hover
CSSValidationPreferencePage.name=Validation

LESSPreferencePage.name=LESS
LESSCompletionPreferencePage.name=Completion
LESSFormatPreferencePage.name=Format
LESSHoverPreferencePage.name=Hover
LESSValidationPreferencePage.name=Validation

SCSSPreferencePage.name=SCSS
SCSSCompletionPreferencePage.name=Completion
SCSSFormatPreferencePage.name=Format
SCSSHoverPreferencePage.name=Hover
SCSSValidationPreferencePage.name=Validation

# HTML
HTMLPreferencePage.name=HTML (Wild Web Developer)
HTMLCompletionPreferencePage.name=Completion
HTMLFormatPreferencePage.name=Format
HTMLHoverPreferencePage.name=Hover
HTMLValidationPreferencePage.name=Validation

# JST/TS
JSTSPreferencePage.name=JS/TS (Wild Web Developer)
TypeScriptPreferencePage.name=TypeScript
JavaScriptPreferencePage.name=JavaScript
JSTSCodeLensPreferencePage.name=Code Lens
JSTSInlayHintPreferencePage.name=Inlay Hint
JSTSFormatterPreferencePage.name=Formatter

# Markdown
MarkdownPreferencePage.name=Markdown (Wild Web Developer)
MarkdownProblem=Markdown Problem

# YAML
YAMLPreferencePage.name=YAML (Wild Web Developer)
YAMLCompletionPreferencePage.name=Completion
YAMLFormatPreferencePage.name=Format
YAMLHoverPreferencePage.name=Hover
YAMLValidationPreferencePage.name=Validation

# preference keywords
preferenceKeywords.yaml=yaml
preferenceKeywords.js=js
preferenceKeywords.ts=ts
preferenceKeywords.javascript=javascript
preferenceKeywords.typescript=typescript
preferenceKeywords.css=css
preferenceKeywords.less=less
preferenceKeywords.scss=scss
preferenceKeywords.sass=sass
preferenceKeywords.html=html
preferenceKeywords.markdown=markdown
36 changes: 34 additions & 2 deletions org.eclipse.wildwebdeveloper/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,11 +514,27 @@
<keywordReference id="org.eclipse.wildwebdeveloper.js" />
<keywordReference id="org.eclipse.wildwebdeveloper.javascript" />
</page>
<page
category="org.eclipse.wildwebdeveloper.jsts.ui.preferences.javascript.JavaScriptPreferencePage"
class="org.eclipse.wildwebdeveloper.jsts.ui.preferences.javascript.JavaScriptCodeLensPreferencePage"
id="org.eclipse.wildwebdeveloper.jsts.ui.preferences.javascript.JavaScriptCodeLensPreferencePage"
name="%JSTSCodeLensPreferencePage.name">
<keywordReference id="org.eclipse.wildwebdeveloper.js" />
<keywordReference id="org.eclipse.wildwebdeveloper.javascript" />
</page>
<page
category="org.eclipse.wildwebdeveloper.jsts.ui.preferences.javascript.JavaScriptPreferencePage"
class="org.eclipse.wildwebdeveloper.jsts.ui.preferences.javascript.JavaScriptInlayHintPreferencePage"
id="org.eclipse.wildwebdeveloper.jsts.ui.preferences.javascript.JavaScriptInlayHintPreferencePage"
name="%JavaScriptInlayHintPreferencePage.name">
name="%JSTSInlayHintPreferencePage.name">
<keywordReference id="org.eclipse.wildwebdeveloper.js" />
<keywordReference id="org.eclipse.wildwebdeveloper.javascript" />
</page>
<page
category="org.eclipse.wildwebdeveloper.jsts.ui.preferences.javascript.JavaScriptPreferencePage"
class="org.eclipse.wildwebdeveloper.jsts.ui.preferences.javascript.JavaScriptFormatterPreferencePage"
id="org.eclipse.wildwebdeveloper.jsts.ui.preferences.javascript.JavaScriptFormatterPreferencePage"
name="%JSTSFormatterPreferencePage.name">
<keywordReference id="org.eclipse.wildwebdeveloper.js" />
<keywordReference id="org.eclipse.wildwebdeveloper.javascript" />
</page>
Expand All @@ -531,11 +547,27 @@
<keywordReference id="org.eclipse.wildwebdeveloper.ts" />
<keywordReference id="org.eclipse.wildwebdeveloper.typescript" />
</page>
<page
category="org.eclipse.wildwebdeveloper.jsts.ui.preferences.typescript.TypeScriptPreferencePage"
class="org.eclipse.wildwebdeveloper.jsts.ui.preferences.typescript.TypeScriptCodeLensPreferencePage"
id="org.eclipse.wildwebdeveloper.jsts.ui.preferences.typescript.TypeScriptCodeLensPreferencePage"
name="%JSTSCodeLensPreferencePage.name">
<keywordReference id="org.eclipse.wildwebdeveloper.ts" />
<keywordReference id="org.eclipse.wildwebdeveloper.typescript" />
</page>
<page
category="org.eclipse.wildwebdeveloper.jsts.ui.preferences.typescript.TypeScriptPreferencePage"
class="org.eclipse.wildwebdeveloper.jsts.ui.preferences.typescript.TypeScriptInlayHintPreferencePage"
id="org.eclipse.wildwebdeveloper.jsts.ui.preferences.typescript.TypeScriptInlayHintPreferencePage"
name="%TypeScriptInlayHintPreferencePage.name">
name="%JSTSInlayHintPreferencePage.name">
<keywordReference id="org.eclipse.wildwebdeveloper.ts" />
<keywordReference id="org.eclipse.wildwebdeveloper.typescript" />
</page>
<page
category="org.eclipse.wildwebdeveloper.jsts.ui.preferences.typescript.TypeScriptPreferencePage"
class="org.eclipse.wildwebdeveloper.jsts.ui.preferences.typescript.TypeScriptFormatterPreferencePage"
id="org.eclipse.wildwebdeveloper.jsts.ui.preferences.typescript.TypeScriptFormatterPreferencePage"
name="%JSTSFormatterPreferencePage.name">
<keywordReference id="org.eclipse.wildwebdeveloper.ts" />
<keywordReference id="org.eclipse.wildwebdeveloper.typescript" />
</page>
Expand Down
10 changes: 4 additions & 6 deletions org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/jsts/JSTSLanguageServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
*******************************************************************************/
package org.eclipse.wildwebdeveloper.jsts;

import static org.eclipse.wildwebdeveloper.jsts.ui.preferences.JSTSPreferenceServerConstants.TYPESCRIPT_PREFERENCES_TSSERVER_TYPESCRIPT_VERSION_PROJECT;
import static org.eclipse.wildwebdeveloper.jsts.ui.preferences.JSTSPreferenceServerConstants.getTypeScriptVersion;
import static org.eclipse.wildwebdeveloper.jsts.ui.preferences.JSTSPreferenceServerConstants.*;

import java.io.File;
import java.io.IOException;
Expand All @@ -35,8 +34,7 @@
import org.eclipse.lsp4j.services.LanguageServer;
import org.eclipse.wildwebdeveloper.Activator;
import org.eclipse.wildwebdeveloper.embedder.node.NodeJSManager;
import org.eclipse.wildwebdeveloper.jsts.ui.preferences.javascript.JavaScriptPreferenceServerConstants;
import org.eclipse.wildwebdeveloper.jsts.ui.preferences.typescript.TypeScriptPreferenceServerConstants;
import org.eclipse.wildwebdeveloper.jsts.ui.preferences.JSTSLanguagePreferences;
import org.eclipse.wildwebdeveloper.ui.preferences.ProcessStreamConnectionProviderWithPreference;

public class JSTSLanguageServer extends ProcessStreamConnectionProviderWithPreference {
Expand Down Expand Up @@ -107,9 +105,9 @@ public Object getInitializationOptions(URI rootUri) {
protected Object createSettings() {
Map<String, Object> settings = new HashMap<>();
// javascript
settings.putAll(JavaScriptPreferenceServerConstants.getGlobalSettings());
settings.putAll(JSTSLanguagePreferences.JS.getGlobalSettings());
// typescript
settings.putAll(TypeScriptPreferenceServerConstants.getGlobalSettings());
settings.putAll(JSTSLanguagePreferences.TS.getGlobalSettings());
return settings;
}

Expand Down
65 changes: 48 additions & 17 deletions org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/jsts/ui/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Angelo ZERR (Red Hat Inc.) - initial implementation
* Pierre-Yves Bigourdan - Allow using TypeScript version specified by project
* Pierre-Yves Bigourdan - Allow configuring directory of ESLint package
* Angelo ZERR (Red Hat Inc.) - initial implementation
* Pierre-Yves Bigourdan - Allow using TypeScript version specified by project
* Pierre-Yves Bigourdan - Allow configuring directory of ESLint package
* Sebastian Thomschke (Vegard IT GmbH) - add CodeLensPreferencePage, FormatterPreferencePage keys
*******************************************************************************/
package org.eclipse.wildwebdeveloper.jsts.ui;

import org.eclipse.osgi.util.NLS;

/**
* JS/TS messages keys.
*
*/
public class Messages extends NLS {

Expand All @@ -27,19 +27,50 @@ public class Messages extends NLS {

public static String JSTSPreferencePage_eslintNodePath;

// --------- TypeScript Inlay Hints preference page
public static String TypeScriptInlayHintPreferencePage_showInlayHintsFor_label;
public static String TypeScriptInlayHintPreferencePage_includeInlayEnumMemberValueHints;
public static String TypeScriptInlayHintPreferencePage_includeInlayFunctionLikeReturnTypeHints;
public static String TypeScriptInlayHintPreferencePage_includeInlayFunctionParameterTypeHints;
public static String TypeScriptInlayHintPreferencePage_includeInlayParameterNameHints;
public static String TypeScriptInlayHintPreferencePage_includeInlayParameterNameHints_none;
public static String TypeScriptInlayHintPreferencePage_includeInlayParameterNameHints_literals;
public static String TypeScriptInlayHintPreferencePage_includeInlayParameterNameHints_all;
public static String TypeScriptInlayHintPreferencePage_includeInlayParameterNameHintsWhenArgumentMatchesName;
public static String TypeScriptInlayHintPreferencePage_includeInlayPropertyDeclarationTypeHints;
public static String TypeScriptInlayHintPreferencePage_includeInlayVariableTypeHints;
public static String TypeScriptInlayHintPreferencePage_includeInlayVariableTypeHintsWhenTypeMatchesName;
// JavaScript / TypeScript Inlay Hints preference page
public static String InlayHintPreferencePage_showInlayHintsFor_label;
public static String InlayHintPreferencePage_includeInlayEnumMemberValueHints;
public static String InlayHintPreferencePage_includeInlayFunctionLikeReturnTypeHints;
public static String InlayHintPreferencePage_includeInlayFunctionParameterTypeHints;
public static String InlayHintPreferencePage_includeInlayParameterNameHints;
public static String InlayHintPreferencePage_includeInlayParameterNameHints_none;
public static String InlayHintPreferencePage_includeInlayParameterNameHints_literals;
public static String InlayHintPreferencePage_includeInlayParameterNameHints_all;
public static String InlayHintPreferencePage_includeInlayParameterNameHintsWhenArgumentMatchesName;
public static String InlayHintPreferencePage_includeInlayPropertyDeclarationTypeHints;
public static String InlayHintPreferencePage_includeInlayVariableTypeHints;
public static String InlayHintPreferencePage_includeInlayVariableTypeHintsWhenTypeMatchesName;

// JavaScript / TypeScript Code Lens preference page
public static String CodeLensPreferencePage_showCodeLensFor_label;
public static String CodeLensPreferencePage_implementationsCodeLens_enabled;
public static String CodeLensPreferencePage_referencesCodeLens_enabled;
public static String CodeLensPreferencePage_referencesCodeLens_showOnAllFunctions;

public static String FormatterPreferencePage_baseIndentSize;
public static String FormatterPreferencePage_convertTabsToSpaces;
public static String FormatterPreferencePage_indentSize;
public static String FormatterPreferencePage_indentStyle;
public static String FormatterPreferencePage_insertSpaceAfterCommaDelimiter;
public static String FormatterPreferencePage_insertSpaceAfterConstructor;
public static String FormatterPreferencePage_insertSpaceAfterFunctionKeywordForAnonymousFunctions;
public static String FormatterPreferencePage_insertSpaceAfterKeywordsInControlFlowStatements;
public static String FormatterPreferencePage_insertSpaceAfterOpeningAndBeforeClosingEmptyBraces;
public static String FormatterPreferencePage_insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces;
public static String FormatterPreferencePage_insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces;
public static String FormatterPreferencePage_insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets;
public static String FormatterPreferencePage_insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis;
public static String FormatterPreferencePage_insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces;
public static String FormatterPreferencePage_insertSpaceAfterSemicolonInForStatements;
public static String FormatterPreferencePage_insertSpaceAfterTypeAssertion;
public static String FormatterPreferencePage_insertSpaceBeforeAndAfterBinaryOperators;
public static String FormatterPreferencePage_insertSpaceBeforeFunctionParenthesis;
public static String FormatterPreferencePage_insertSpaceBeforeTypeAnnotation;
public static String FormatterPreferencePage_newLineCharacter;
public static String FormatterPreferencePage_placeOpenBraceOnNewLineForControlBlocks;
public static String FormatterPreferencePage_placeOpenBraceOnNewLineForFunctions;
public static String FormatterPreferencePage_semicolons;
public static String FormatterPreferencePage_trimTrailingWhitespace;

static {
NLS.initializeMessages("org.eclipse.wildwebdeveloper.jsts.ui.messages", Messages.class); //$NON-NLS-1$
Expand Down
Loading
Loading