Fix #131

Author: angelozerr

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

@@ -138,6 +138,9 @@ public class TypeScriptUIMessages extends NLS {
 	public static String AbstractAnnotationHover_message_singleQuickFix;
 	public static String AbstractAnnotationHover_message_multipleQuickFix;
 
+	// Implementation
+	public static String TypeScriptImplementationLabelProvider_text;
+
 	public static ResourceBundle getResourceBundle() {
 		try {
 			if (fResourceBundle == null)

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

@@ -113,4 +113,7 @@ Launch_MainTab_Not_a_directory=The specified location is not a directory
 
 # Hover
 AbstractAnnotationHover_message_singleQuickFix= 1 quick fix available:
-AbstractAnnotationHover_message_multipleQuickFix= {0} quick fixes available:
+AbstractAnnotationHover_message_multipleQuickFix= {0} quick fixes available:
+
+# Implementation
+TypeScriptImplementationLabelProvider_text=''{0}''.

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/implementation/TypeScriptImplementationContentProvider.java

@@ -1,3 +1,13 @@
+/**
+ *  Copyright (c) 2015-2017 Angelo ZERR.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <[email protected]> - initial API and implementation
+ */
 package ts.eclipse.ide.ui.implementation;
 
 import java.util.List;
@@ -8,7 +18,6 @@ public class TypeScriptImplementationContentProvider implements ITreeContentProv
 
 	@Override
 	public Object[] getChildren(Object arg0) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
@@ -28,7 +37,6 @@ public Object getParent(Object arg0) {
 
 	@Override
 	public boolean hasChildren(Object arg0) {
-		// TODO Auto-generated method stub
 		return false;
 	}
 

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/implementation/TypeScriptImplementationDialog.java

@@ -1,3 +1,13 @@
+/**
+ *  Copyright (c) 2015-2017 Angelo ZERR.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <[email protected]> - initial API and implementation
+ */
 package ts.eclipse.ide.ui.implementation;
 
 import java.util.ArrayList;
@@ -14,6 +24,10 @@
 import ts.eclipse.ide.ui.TypeScriptUIPlugin;
 import ts.resources.ITypeScriptFile;
 
+/**
+ * Popiup dialog which shows implementation for a given text selection.
+ *
+ */
 public class TypeScriptImplementationDialog extends AbstractInformationControl {
 
 	public TypeScriptImplementationDialog(Shell parent, int shellStyle, ITypeScriptFile tsFile) {
@@ -27,12 +41,11 @@ public void setInput(Object input) {
 			try {
 				final TreeViewer treeViewer = getTreeViewer();
 				tsFile.implementation(selection.getOffset()).thenAccept(spans -> {
-					if (treeViewer != null) {
+					if (treeViewer != null && spans != null && spans.size() > 0) {
 						treeViewer.getTree().getDisplay().asyncExec(new Runnable() {
 
 							@Override
 							public void run() {
-								System.err.println("refresh");
 								treeViewer.setInput(spans);
 							}
 						});

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/implementation/TypeScriptImplementationLabelProvider.java

@@ -1,16 +1,65 @@
+/**
+ *  Copyright (c) 2015-2017 Angelo ZERR.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <[email protected]> - initial API and implementation
+ */
 package ts.eclipse.ide.ui.implementation;
 
+import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.model.WorkbenchLabelProvider;
 
 import ts.client.FileSpan;
+import ts.eclipse.ide.core.utils.WorkbenchResourceUtil;
+import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
 
+/**
+ * TypeScript implementation label provider.
+ *
+ */
 public class TypeScriptImplementationLabelProvider extends LabelProvider {
 
+	private static final WorkbenchLabelProvider INSTANCE = new WorkbenchLabelProvider();
+
 	@Override
 	public String getText(Object element) {
 		if (element instanceof FileSpan) {
-
+			String filename = getFilename(((FileSpan) element));
+			return NLS.bind(TypeScriptUIMessages.TypeScriptImplementationLabelProvider_text, filename);
 		}
 		return super.getText(element);
 	}
+
+	private String getFilename(FileSpan span) {
+		IFile file = getEclipseFile(span);
+		return file != null ? file.getFullPath().toString() : span.getFile();
+	}
+
+	private IFile getEclipseFile(FileSpan span) {
+		String filename = span.getFile();
+		IFile file = WorkbenchResourceUtil.findFileFromWorkspace(filename);
+		if (file != null) {
+			return file;
+		}
+		return null;
+	}
+
+	@Override
+	public Image getImage(Object element) {
+		if (element instanceof FileSpan) {
+			IFile file = getEclipseFile((FileSpan) element);
+			if (file != null) {
+				return INSTANCE.getImage(file);
+			}
+		}
+		return super.getImage(element);
+	}
+
 }

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/search/TypeScriptSearchQuery.java

@@ -86,7 +86,6 @@ public IStatus run(IProgressMonitor monitor) throws OperationCanceledException {
 					ReferencesResponseBody references = tsFile.references(offset).get(20000, TimeUnit.MILLISECONDS);
 					for (ReferencesResponseItem reference : references.getRefs()) {
 						addRef(reference, tsResult);
-
 					}
 				}
 			} finally {