Fixes #340

com.palantir.typescript/src/com/palantir/typescript/services/language/CompletionEntryDetails.java

@@ -36,13 +36,15 @@ public final class CompletionEntryDetails {
     private ImmutableList<ScriptElementKindModifier> kindModifiers;
     private ImmutableList<SymbolDisplayPart> displayParts;
     private ImmutableList<SymbolDisplayPart> documentation;
+    private ImmutableList<JSDocTagInfo> tags;
 
     public CompletionEntryDetails(
             @JsonProperty("name") String name,
             @JsonProperty("kind") ScriptElementKind kind,
             @JsonProperty("kindModifiers") String kindModifiers,
             @JsonProperty("displayParts") List<SymbolDisplayPart> displayParts,
-            @JsonProperty("documentation") List<SymbolDisplayPart> documentation) {
+            @JsonProperty("documentation") List<SymbolDisplayPart> documentation,
+            @JsonProperty("tags") List<JSDocTagInfo> tags) {
         checkNotNull(name);
         checkNotNull(kind);
         checkNotNull(kindModifiers);
@@ -52,6 +54,7 @@ public CompletionEntryDetails(
         this.kindModifiers = ScriptElementKindModifier.parseList(kindModifiers);
         this.displayParts = ImmutableList.copyOf(displayParts);
         this.documentation = ImmutableList.copyOf(documentation);
+        this.tags = ImmutableList.copyOf(tags);
     }
 
     public String getName() {
@@ -74,6 +77,10 @@ public String getDocumentation() {
         return SymbolDisplayPart.getText(this.documentation);
     }
 
+    public String getTags() {
+        return JSDocTagInfo.getText(this.tags);
+    }
+
     @Override
     public String toString() {
         return Objects.toStringHelper(this)
@@ -82,6 +89,7 @@ public String toString() {
             .add("kindModifiers", this.kindModifiers)
             .add("displayParts", this.displayParts)
             .add("documentation", this.documentation)
+            .add("tags", this.tags)
             .toString();
     }
 

com.palantir.typescript/src/com/palantir/typescript/services/language/JSDocTagInfo.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2017 Palantir Technologies, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.palantir.typescript.services.language;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Objects;
+import com.google.common.base.StandardSystemProperty;
+
+/**
+ * Corresponds to the class with the same name in TypeScript.
+ *
+ * @author Rouche
+ */
+public final class JSDocTagInfo {
+
+    private final String name;
+    private final String text;
+
+    public JSDocTagInfo(
+            @JsonProperty("name") String name,
+            @JsonProperty("text") String text) {
+        checkNotNull(name);
+
+        this.name = name;
+        this.text = text;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getText() {
+        return this.text;
+    }
+
+    @Override
+    public String toString() {
+        return Objects.toStringHelper(this)
+            .add("name", this.name)
+            .add("text", this.text)
+            .toString();
+    }
+
+    public static String getText(List<JSDocTagInfo> parts) {
+        checkNotNull(parts);
+
+        StringBuilder displayText = new StringBuilder();
+
+        for (JSDocTagInfo part : parts) {
+            displayText.append(part.getName());
+            if(part.getText() != null && part.getText().trim().length() > 0) {
+                displayText.append(" ");
+                displayText.append(part.getText());
+            }
+            displayText.append(StandardSystemProperty.LINE_SEPARATOR.value());
+        }
+
+        return displayText.toString();
+    }
+}

com.palantir.typescript/src/com/palantir/typescript/services/language/QuickInfo.java

@@ -36,13 +36,15 @@ public final class QuickInfo {
     private final TextSpan textSpan;
     private final ImmutableList<SymbolDisplayPart> displayParts;
     private final ImmutableList<SymbolDisplayPart> documentation;
+    private final ImmutableList<JSDocTagInfo> tags;
 
     public QuickInfo(
             @JsonProperty("kind") ScriptElementKind kind,
             @JsonProperty("kindModifiers") String kindModifiers,
             @JsonProperty("textSpan") TextSpan textSpan,
             @JsonProperty("displayParts") List<SymbolDisplayPart> displayParts,
-            @JsonProperty("documentation") List<SymbolDisplayPart> documentation) {
+            @JsonProperty("documentation") List<SymbolDisplayPart> documentation,
+            @JsonProperty("tags") List<JSDocTagInfo> tags) {
         checkNotNull(kind);
         checkNotNull(kindModifiers);
         checkNotNull(textSpan);
@@ -53,6 +55,7 @@ public QuickInfo(
         this.textSpan = textSpan;
         this.displayParts = ImmutableList.copyOf(displayParts);
         this.documentation = documentation != null ? ImmutableList.copyOf(documentation) : ImmutableList.<SymbolDisplayPart> of();
+        this.tags = ImmutableList.copyOf(tags);
     }
 
     public ScriptElementKind getKind() {
@@ -79,6 +82,14 @@ public List<SymbolDisplayPart> getDocumentation() {
         return this.documentation;
     }
 
+    public List<JSDocTagInfo> getTags() {
+        return this.tags;
+    }
+
+    public String getTagsText() {
+        return JSDocTagInfo.getText(this.tags);
+    }
+
     public String getDocumentationText() {
         return SymbolDisplayPart.getText(this.documentation);
     }
@@ -91,6 +102,7 @@ public String toString() {
             .add("textSpan", this.textSpan)
             .add("displayParts", this.displayParts)
             .add("documentation", this.documentation)
+            .add("tags", this.tags)
             .toString();
     }
 }

com.palantir.typescript/src/com/palantir/typescript/text/ContentAssistProcessor.java

@@ -35,6 +35,7 @@
 import org.eclipse.swt.graphics.Image;
 
 import com.google.common.base.CharMatcher;
+import com.google.common.base.StandardSystemProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.palantir.typescript.Images;
@@ -112,9 +113,8 @@ public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int
                     Image image = Images.getImage(entry.getKind(), entry.getKindModifiers());
                     String displayString = entry.getName() + " " + entry.getDisplayParts();
                     IContextInformation contextInformation = null;
-                    String additionalProposalInfo = entry.getDocumentation();
                     CompletionProposal proposal = new CompletionProposal(replacementString, replacementOffset, replacementLength,
-                        cursorPosition, image, displayString, contextInformation, additionalProposalInfo);
+                        cursorPosition, image, displayString, contextInformation, getAdditionalInfo(entry));
 
                     proposals.add(proposal);
                 }
@@ -159,6 +159,17 @@ public String getErrorMessage() {
     public void selectionChanged(ICompletionProposal proposal, boolean smartToggle) {
     }
 
+    private String getAdditionalInfo(CompletionEntryDetails entry) {
+
+        StringBuilder info = new StringBuilder(entry.getDocumentation());
+        if(info.length() > 0) {
+            info.append(StandardSystemProperty.LINE_SEPARATOR.value());
+        }
+        info.append(entry.getTags());
+
+        return info.toString();
+    }
+
     private int getOffset(int offset) {
         if (this.currentCompletionInfo != null) {
             boolean memberCompletion = this.currentCompletionInfo.isMemberCompletion();

com.palantir.typescript/src/com/palantir/typescript/text/reconciler/PresentationReconciler.java

@@ -118,17 +118,22 @@ public IPresentationRepairer getRepairer(String contentType) {
      */
     private void processEvent(TextEvent event) {
         IRegion damagedRegion = this.getDamagedRegion(event);
-        EndOfLineState lastDamagedLexState = this.updateFinalLexStates(event, damagedRegion);
-        TextPresentation presentation = this.createPresentation(damagedRegion, lastDamagedLexState);
+        if(damagedRegion != null) {
+            EndOfLineState lastDamagedLexState = this.updateFinalLexStates(event, damagedRegion);
+            TextPresentation presentation = this.createPresentation(damagedRegion, lastDamagedLexState);
 
-        this.viewer.changeTextPresentation(presentation, false);
+            this.viewer.changeTextPresentation(presentation, false);
+        }
     }
 
     /**
      * Gets the damaged region by selecting the whole lines touched by the text edit.
      */
     private IRegion getDamagedRegion(TextEvent event) {
         IDocument document = this.viewer.getDocument();
+        if(document == null) {
+            return null;
+        }
         int documentLength = document.getLength();
         int offset = event.getOffset();
         int length = event.getLength();