From 0af118c5be23350cd908a6b9cc9f46413fb0319b Mon Sep 17 00:00:00 2001
From: Andrey Breslav <abreslav@abreslav-mac.labs.intellij.net>
Date: Fri, 8 Jul 2011 15:41:00 +0400
Subject: [PATCH] Small cosmetics

---
 grammar/src/lexical.grm                                   | 2 +-
 .../jet/grammar/ConfluenceHyperlinksGenerator.java        | 8 ++++----
 idea/src/org/jetbrains/jet/JetNodeTypes.java              | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/grammar/src/lexical.grm b/grammar/src/lexical.grm
index 3057de0cc71..9780cce228c 100644
--- a/grammar/src/lexical.grm
+++ b/grammar/src/lexical.grm
@@ -33,7 +33,7 @@ NoEscapeString
   : <"""-quoted string>;
 
 /**
-bq. See [String templates]
+bq. See [String templates|Strings#Templates]
 */
 
 SEMI
diff --git a/grammar/src/org/jetbrains/jet/grammar/ConfluenceHyperlinksGenerator.java b/grammar/src/org/jetbrains/jet/grammar/ConfluenceHyperlinksGenerator.java
index daffdaf0224..f013196f32a 100644
--- a/grammar/src/org/jetbrains/jet/grammar/ConfluenceHyperlinksGenerator.java
+++ b/grammar/src/org/jetbrains/jet/grammar/ConfluenceHyperlinksGenerator.java
@@ -1,10 +1,10 @@
 package org.jetbrains.jet.grammar;
 
 import com.google.common.base.Supplier;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
+import com.google.common.collect.Sets;
 
 import java.awt.*;
 import java.awt.datatransfer.Clipboard;
@@ -94,10 +94,10 @@ public class ConfluenceHyperlinksGenerator {
 
         Set<String> declaredSymbols = new HashSet<String>();
         Set<String> usedSymbols = new HashSet<String>();
-        Multimap<String, String> usages = Multimaps.newListMultimap(Maps.<String, Collection<String>>newHashMap(), new Supplier<List<String>>() {
+        Multimap<String, String> usages = Multimaps.newSetMultimap(Maps.<String, Collection<String>>newHashMap(), new Supplier<Set<String>>() {
             @Override
-            public List<String> get() {
-                return Lists.newArrayList();
+            public Set<String> get() {
+                return Sets.newHashSet();
             }
         });
         List<Token> tokens = new ArrayList<Token>();
diff --git a/idea/src/org/jetbrains/jet/JetNodeTypes.java b/idea/src/org/jetbrains/jet/JetNodeTypes.java
index 24db2edf54a..4197a857a53 100644
--- a/idea/src/org/jetbrains/jet/JetNodeTypes.java
+++ b/idea/src/org/jetbrains/jet/JetNodeTypes.java
@@ -74,7 +74,6 @@ public interface JetNodeTypes {
     JetNodeType TUPLE                     = new JetNodeType("TUPLE", JetTupleExpression.class);
     JetNodeType PARENTHESIZED             = new JetNodeType("PARENTHESIZED", JetParenthesizedExpression.class);
     JetNodeType TYPEOF                    = new JetNodeType("TYPEOF", JetTypeofExpression.class);
-//    JetNodeType NEW                       = new JetNodeType("NEW", JetNewExpression.class);
     JetNodeType RETURN                    = new JetNodeType("RETURN", JetReturnExpression.class);
     JetNodeType THROW                     = new JetNodeType("THROW", JetThrowExpression.class);
     JetNodeType CONTINUE                  = new JetNodeType("CONTINUE", JetContinueExpression.class);
@@ -128,7 +127,7 @@ public interface JetNodeTypes {
     JetNodeType TUPLE_PATTERN_ENTRY       = new JetNodeType("TUPLE_PATTERN_ENTRY", JetTuplePatternEntry.class);
     JetNodeType DECOMPOSER_PATTERN        = new JetNodeType("DECOMPOSER_PATTERN", JetDecomposerPattern.class);
     JetNodeType DECOMPOSER_ARGUMENT_LIST  = new JetNodeType("DECOMPOSER_ARGUMENT_LIST", JetTuplePattern.class);
-    JetNodeType DECOMPOSER_ARGUMENT       = TUPLE_PATTERN_ENTRY;//new JetNodeType("DECOMPOSER_ARGUMENT", JetTuplePatternEntry.class);
+    JetNodeType DECOMPOSER_ARGUMENT       = TUPLE_PATTERN_ENTRY;
 
     JetNodeType WHEN                      = new JetNodeType("WHEN", JetWhenExpression.class);
     JetNodeType WHEN_ENTRY                = new JetNodeType("WHEN_ENTRY", JetWhenEntry.class);