Skip to content

Commit 0bb82fb

Browse files
author
angelozerr
committed
Enable Format (without implementation) with Ctrl+Shift+F
1 parent c8b0a50 commit 0bb82fb

File tree

6 files changed

+51
-11
lines changed

6 files changed

+51
-11
lines changed

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/plugin.properties

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ ProblemTypeScriptHoverDescription= TypeScript Problem
2323
TypeScriptHover=TypeScript
2424
TypeScriptHoverDescription=TypeScript
2525

26+
context.name.0 = TypeScript View
27+
context.description.0 = TypeScript View Context
28+
2629
##########################################################################
2730
# TypeScript Search
2831
##########################################################################

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/plugin.xml

+11-2
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,15 @@
193193
parentId="org.eclipse.ui.textEditorScope"
194194
id="ts.eclipse.ide.jsdt.ui.typeScriptEditorScope">
195195
</context>
196+
<!-- Not really the scope for the JavScript View.. just extends the editor
197+
scope for now.
198+
-->
199+
<context
200+
name="%context.name.0"
201+
description="%context.description.0"
202+
parentId="ts.eclipse.ide.jsdt.ui.typeScriptEditorScope"
203+
id="ts.eclipse.ide.jsdt.ui.typeScriptViewScope">
204+
</context>
196205
</extension>
197206

198207
<extension
@@ -228,14 +237,14 @@
228237
<!-- edit -->
229238
<key
230239
sequence="M1+M2+F"
231-
contextId="ts.eclipse.ide.jsdt.ui.typeScriptEditorScope"
240+
contextId="ts.eclipse.ide.jsdt.ui.typeScriptViewScope"
232241
commandId="ts.eclipse.ide.jsdt.ui.edit.text.java.format"
233242
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
234243
<!-- alternative for some gtk input modes -->
235244
<key
236245
platform="gtk"
237246
sequence="ESC CTRL+F"
238-
contextId="ts.eclipse.ide.jsdt.ui.typeScriptEditorScope"
247+
contextId="ts.eclipse.ide.jsdt.ui.typeScriptViewScope"
239248
commandId="ts.eclipse.ide.jsdt.ui.edit.text.java.format"
240249
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
241250
</extension>

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/editor/TypeScriptEditor.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,9 @@ protected void createActions() {
3535
// PlatformUI.getWorkbench().getHelpSystem().setHelp(action,
3636
// IJavaHelpContextIds.FORMAT_ACTION);
3737
}
38-
38+
39+
@Override
40+
protected void initializeKeyBindingScopes() {
41+
setKeyBindingScopes(new String[] { "ts.eclipse.ide.jsdt.ui.typeScriptViewScope" }); //$NON-NLS-1$
42+
}
3943
}

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/editor/TypeScriptSourceViewerConfiguration.java

+7
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.eclipse.jface.text.contentassist.ContentAssistant;
1717
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
1818
import org.eclipse.jface.text.contentassist.IContentAssistant;
19+
import org.eclipse.jface.text.formatter.IContentFormatter;
1920
import org.eclipse.jface.text.source.ISourceViewer;
2021
import org.eclipse.ui.texteditor.ITextEditor;
2122
import org.eclipse.wst.jsdt.internal.ui.JavaScriptPlugin;
@@ -27,6 +28,8 @@
2728
import org.eclipse.wst.jsdt.ui.text.JavaScriptSourceViewerConfiguration;
2829

2930
import ts.eclipse.ide.jsdt.internal.ui.editor.contentassist.TypeScriptCompletionProcessor;
31+
import ts.eclipse.ide.jsdt.internal.ui.editor.contentassist.TypeScriptContentAssistInvocationContext;
32+
import ts.eclipse.ide.jsdt.internal.ui.editor.format.TypeScriptContentFormatter;
3033

3134
/**
3235
* Extension of JSDT {@link JavaScriptSourceViewerConfiguration}
@@ -96,4 +99,8 @@ private IDialogSettings getSettings(final String sectionName) {
9699
return settings;
97100
}
98101

102+
@Override
103+
public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
104+
return new TypeScriptContentFormatter(getEditor());
105+
}
99106
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package ts.eclipse.ide.jsdt.internal.ui.editor.format;
2+
3+
import org.eclipse.jface.text.IDocument;
4+
import org.eclipse.jface.text.IRegion;
5+
import org.eclipse.jface.text.formatter.IContentFormatter;
6+
import org.eclipse.jface.text.formatter.IFormattingStrategy;
7+
import org.eclipse.ui.texteditor.ITextEditor;
8+
9+
public class TypeScriptContentFormatter implements IContentFormatter {
10+
11+
public TypeScriptContentFormatter(ITextEditor editor) {
12+
// TODO Auto-generated constructor stub
13+
}
14+
15+
@Override
16+
public void format(IDocument document, IRegion region) {
17+
System.err.println(document.get());
18+
}
19+
20+
@Override
21+
public IFormattingStrategy getFormattingStrategy(String contentType) {
22+
return null;
23+
}
24+
25+
}

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/editor/format/TypeScriptFormattingStrategy.java

-8
This file was deleted.

0 commit comments

Comments
 (0)