Merge remote-tracking branch 'origin/master'

java/java-impl/src/com/intellij/codeInsight/lookup/PsiTypeLookupItem.java

@@ -234,7 +234,7 @@ public class PsiTypeLookupItem extends LookupItem {
     PsiFile file = context.getFile();
     int newTail = JavaCompletionUtil.insertClassReference(aClass, file, context.getStartOffset(), context.getTailOffset());
     context.setTailOffset(newTail);
-    PostprocessReformattingAspect.getInstance(context.getProject()).doPostponedFormatting();
     JavaCompletionUtil.shortenReference(file, context.getStartOffset());
+    PostprocessReformattingAspect.getInstance(context.getProject()).doPostponedFormatting();
   }
 }

platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java

@@ -784,7 +784,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
         int bs = myEditor.logicalPositionToOffset(new LogicalPosition(line, blockStart.column));
         int start = bs - prefix.length();
         int end = myEditor.logicalPositionToOffset(new LogicalPosition(line, blockEnd.column));
-        if (start >= end) {
+        if (start > end) {
           LOG.error("bs=" + bs + "; start=" + start + "; end=" + end +
                     "; blockStart=" + blockStart + "; blockEnd=" + blockEnd + "; line=" + line + "; len=" +
                     (document.getLineEndOffset(line) - document.getLineStartOffset(line)));
@@ -1275,7 +1275,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
   public void hideLookup(boolean explicitly) {
     ApplicationManager.getApplication().assertIsDispatchThread();
 
-    if (myDisposed) return;
+    if (myHidden) return;
 
     doHide(true, explicitly);
   }

platform/platform-api/src/com/intellij/ui/table/TableView.java

@@ -41,6 +41,15 @@ public class TableView<Item> extends BaseTableView implements ItemsProvider, Sel
     super.setModel(dataModel);
   }
 
+  /**
+   * use {@link #setModelAndUpdateColumns(com.intellij.util.ui.ListTableModel<Item>)} instead
+   * @param model
+   */
+  @Deprecated
+  public void setModel(final ListTableModel<Item> model) {
+    setModelAndUpdateColumns(model);
+  }
+  
   public void setModelAndUpdateColumns(final ListTableModel<Item> model) {
     super.setModel(model);
     updateColumnSizes();