Skip to content

Commit 43110ce

Browse files
author
angelozerr
committed
Remove sort since tsserver sort it on server side. See
#80
1 parent e3e6ea8 commit 43110ce

File tree

6 files changed

+1
-51
lines changed

6 files changed

+1
-51
lines changed
Binary file not shown.
Binary file not shown.

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/TypeScriptUIMessages.java

-3
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,6 @@ public class TypeScriptUIMessages extends NLS {
119119
public static String TypeScriptContentOutlinePage_CollapseAllAction_label;
120120
public static String TypeScriptContentOutlinePage_CollapseAllAction_description;
121121
public static String TypeScriptContentOutlinePage_CollapseAllAction_tooltip;
122-
public static String TypeScriptContentOutlinePage_LexicalSortingAction_label;
123-
public static String TypeScriptContentOutlinePage_LexicalSortingAction_description;
124-
public static String TypeScriptContentOutlinePage_LexicalSortingAction_tooltip;
125122

126123
public static ResourceBundle getResourceBundle() {
127124
try {

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/TypeScriptUIMessages.properties

+1-4
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,4 @@ DiscoverBuildPathDialog_SearchBuildPathJob_name=Search tsconfig.json files job
9292
# Outline
9393
TypeScriptContentOutlinePage_CollapseAllAction_label=Collapse All
9494
TypeScriptContentOutlinePage_CollapseAllAction_tooltip=Collapse All
95-
TypeScriptContentOutlinePage_CollapseAllAction_description=Collapse All
96-
TypeScriptContentOutlinePage_LexicalSortingAction_label=Sort
97-
TypeScriptContentOutlinePage_LexicalSortingAction_tooltip=Sort
98-
TypeScriptContentOutlinePage_LexicalSortingAction_description=Enable Sorting
95+
TypeScriptContentOutlinePage_CollapseAllAction_description=Collapse All

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/TypeScriptUIImageResource.java

-4
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ public class TypeScriptUIImageResource {
5454
public static final String IMG_STOP_DISABLED = "stop_disabled";
5555
public static final String IMG_COLLAPSE_ALL_ENABLED = "collapseall_enabled";
5656
public static final String IMG_COLLAPSE_ALL_DISABLED = "collapseall_disabled";
57-
public static final String IMG_ALPHAB_SORT_CO_ENABLED = "alphab_sort_co_enabled";
58-
public static final String IMG_ALPHAB_SORT_CO_DISABLED = "alphab_sort_co_disabled";
5957

6058
public static final String DESC_OVR_LIBRARY = "ovr_library";
6159

@@ -155,8 +153,6 @@ protected static void initializeImageRegistry() {
155153
registerImage(IMG_STOP_DISABLED, URL_DLCL + "launch_stop.gif");
156154
registerImage(IMG_COLLAPSE_ALL_ENABLED, URL_ELCL + "collapseall.gif");
157155
registerImage(IMG_COLLAPSE_ALL_DISABLED, URL_DLCL + "collapseall.gif");
158-
registerImage(IMG_ALPHAB_SORT_CO_ENABLED, URL_ELCL + "alphab_sort_co.gif");
159-
registerImage(IMG_ALPHAB_SORT_CO_DISABLED, URL_DLCL + "alphab_sort_co.gif");
160156

161157
registerImage(DESC_OVR_LIBRARY, URL_OVR + "library_ovr.gif");
162158
}

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/outline/TypeScriptContentOutlinePage.java

-40
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.eclipse.jface.viewers.TreeViewer;
2323
import org.eclipse.jface.viewers.ViewerFilter;
2424
import org.eclipse.swt.SWT;
25-
import org.eclipse.swt.custom.BusyIndicator;
2625
import org.eclipse.swt.widgets.Composite;
2726
import org.eclipse.swt.widgets.Control;
2827
import org.eclipse.ui.IActionBars;
@@ -184,48 +183,9 @@ public void dispose() {
184183
*/
185184
private void registerToolbarActions(IActionBars actionBars) {
186185
IToolBarManager toolBarManager = actionBars.getToolBarManager();
187-
toolBarManager.add(new LexicalSortingAction());
188186
toolBarManager.add(new CollapseAllAction(this.fOutlineViewer));
189187
}
190188

191-
/**
192-
* Sort action
193-
*
194-
*/
195-
class LexicalSortingAction extends Action {
196-
197-
public LexicalSortingAction() {
198-
super(TypeScriptUIMessages.TypeScriptContentOutlinePage_LexicalSortingAction_label);
199-
setDescription(TypeScriptUIMessages.TypeScriptContentOutlinePage_LexicalSortingAction_description);
200-
setToolTipText(TypeScriptUIMessages.TypeScriptContentOutlinePage_LexicalSortingAction_tooltip);
201-
super.setImageDescriptor(
202-
TypeScriptUIImageResource.getImageDescriptor(TypeScriptUIImageResource.IMG_ALPHAB_SORT_CO_ENABLED));
203-
super.setDisabledImageDescriptor(TypeScriptUIImageResource
204-
.getImageDescriptor(TypeScriptUIImageResource.IMG_ALPHAB_SORT_CO_DISABLED));
205-
boolean checked = TypeScriptUIPlugin.getDefault().getPreferenceStore()
206-
.getBoolean("LexicalSortingAction.isChecked");
207-
// $NON-NLS-1$
208-
valueChanged(checked, false);
209-
}
210-
211-
public void run() {
212-
valueChanged(isChecked(), true);
213-
}
214-
215-
private void valueChanged(final boolean on, boolean store) {
216-
setChecked(on);
217-
BusyIndicator.showWhile(fOutlineViewer.getControl().getDisplay(), new Runnable() {
218-
public void run() {
219-
// TODO
220-
}
221-
});
222-
223-
if (store) {
224-
TypeScriptUIPlugin.getDefault().getPreferenceStore().setValue("LexicalSortingAction.isChecked", on); // $NON-NLS-1$
225-
}
226-
}
227-
}
228-
229189
/**
230190
* Collapse all action
231191
*

0 commit comments

Comments
 (0)