From 0d24fabd8465ec38211180897106f3e7e5976f7c Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Thu, 23 Oct 2014 02:24:48 +0200
Subject: [PATCH 001/132] Update pydevd.

---
 python/helpers/pydev/_pydev_imports_tipper.py |  7 +++++--
 python/helpers/pydev/_pydev_threading.py      |  5 ++++-
 python/helpers/pydev/pydev_runfiles.py        |  8 ++++++--
 python/helpers/pydev/pydevd.py                |  7 ++++---
 python/helpers/pydev/pydevd_plugin_utils.py   |  2 +-
 python/helpers/pydev/pydevd_resolver.py       | 10 +++++-----
 python/helpers/pydev/runfiles.py              |  2 ++
 7 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/python/helpers/pydev/_pydev_imports_tipper.py b/python/helpers/pydev/_pydev_imports_tipper.py
index 76cf2cdc473f..35c4867533a8 100644
--- a/python/helpers/pydev/_pydev_imports_tipper.py
+++ b/python/helpers/pydev/_pydev_imports_tipper.py
@@ -178,8 +178,11 @@ def GenerateImportsTipForModule(obj_to_complete, dirComps=None, getattr=getattr,
         args = ''
 
         try:
-            obj = getattr(obj_to_complete, d)
-        except: #just ignore and get it without aditional info
+            try:
+                obj = getattr(obj_to_complete.__class__, d)
+            except:
+                obj = getattr(obj_to_complete, d)
+        except: #just ignore and get it without additional info
             ret.append((d, '', args, TYPE_BUILTIN))
         else:
 
diff --git a/python/helpers/pydev/_pydev_threading.py b/python/helpers/pydev/_pydev_threading.py
index 62b300b86cd0..940dce5edcf3 100644
--- a/python/helpers/pydev/_pydev_threading.py
+++ b/python/helpers/pydev/_pydev_threading.py
@@ -1,4 +1,7 @@
-from threading import enumerate, currentThread, Condition, Event, Timer, Thread
+from threading import * # Make up for things we may forget @UnusedWildImport
+
+# Force what we know we need
+from threading import enumerate, currentThread, Condition, Event, Timer, Thread, Lock
 try:
     from threading import settrace
 except:
diff --git a/python/helpers/pydev/pydev_runfiles.py b/python/helpers/pydev/pydev_runfiles.py
index bb704db3f240..b20927584088 100644
--- a/python/helpers/pydev/pydev_runfiles.py
+++ b/python/helpers/pydev/pydev_runfiles.py
@@ -3,11 +3,9 @@ from __future__ import nested_scopes
 import fnmatch
 import os.path
 from pydev_runfiles_coverage import StartCoverageSupport
-import pydev_runfiles_unittest
 from pydevd_constants import * #@UnusedWildImport
 import re
 import time
-import unittest
 
 
 #=======================================================================================================================
@@ -558,6 +556,7 @@ class PydevTestRunner(object):
 
 
     def _decorate_test_suite(self, suite, pyfile, module_name):
+        import unittest
         if isinstance(suite, unittest.TestSuite):
             add = False
             suite.__pydev_pyfile__ = pyfile
@@ -582,6 +581,8 @@ class PydevTestRunner(object):
     def find_tests_from_modules(self, file_and_modules_and_module_name):
         """ returns the unittests given a list of modules """
         #Use our own suite!
+        import pydev_runfiles_unittest
+        import unittest
         unittest.TestLoader.suiteClass = pydev_runfiles_unittest.PydevTestSuite
         loader = unittest.TestLoader()
 
@@ -628,6 +629,7 @@ class PydevTestRunner(object):
     def filter_tests(self, test_objs, internal_call=False):
         """ based on a filter name, only return those tests that have
             the test case names that match """
+        import unittest
         if not internal_call:
             if not self.configuration.include_tests and not self.tests and not self.configuration.exclude_tests:
                 #No need to filter if we have nothing to filter!
@@ -692,6 +694,7 @@ class PydevTestRunner(object):
 
     def iter_tests(self, test_objs):
         #Note: not using yield because of Jython 2.1.
+        import unittest
         tests = []
         for test_obj in test_objs:
             if isinstance(test_obj, unittest.TestSuite):
@@ -762,6 +765,7 @@ class PydevTestRunner(object):
         all_tests = self.find_tests_from_modules(file_and_modules_and_module_name)
         all_tests = self.filter_tests(all_tests)
 
+        import pydev_runfiles_unittest
         test_suite = pydev_runfiles_unittest.PydevTestSuite(all_tests)
         import pydev_runfiles_xml_rpc
         pydev_runfiles_xml_rpc.notifyTestsCollected(test_suite.countTestCases())
diff --git a/python/helpers/pydev/pydevd.py b/python/helpers/pydev/pydevd.py
index cd6a034e5aba..dfac7691dc79 100644
--- a/python/helpers/pydev/pydevd.py
+++ b/python/helpers/pydev/pydevd.py
@@ -116,9 +116,10 @@ DONT_TRACE = {
               'threading.py':1,
 
               # thirs party libs that we don't want to trace
-              'pluginbase.py':1,
-              'pkgutil_old.py':1,
-              'uuid_old.py':1,
+              '_pydev_pluginbase.py':1,
+              '_pydev_pkgutil_old.py':1,
+              '_pydev_uuid_old.py':1,
+
 
               #things from pydev that we don't want to trace
               '_pydev_execfile.py':1,
diff --git a/python/helpers/pydev/pydevd_plugin_utils.py b/python/helpers/pydev/pydevd_plugin_utils.py
index f50bdf8425e8..4ccdfb44e3df 100644
--- a/python/helpers/pydev/pydevd_plugin_utils.py
+++ b/python/helpers/pydev/pydevd_plugin_utils.py
@@ -2,7 +2,7 @@ import types
 
 import pydev_log
 import pydevd_trace_api
-from third_party.pluginbase import PluginBase
+from _pydev_imps._pydev_pluginbase import PluginBase
 from pydevd_constants import *  # @UnusedWildImport
 
 def load_plugins(package):
diff --git a/python/helpers/pydev/pydevd_resolver.py b/python/helpers/pydev/pydevd_resolver.py
index cc67cd043cec..a1c7a1dfe40e 100644
--- a/python/helpers/pydev/pydevd_resolver.py
+++ b/python/helpers/pydev/pydevd_resolver.py
@@ -18,7 +18,7 @@ from pydevd_constants import DictIterItems, xrange
 
 # Note: 300 is already a lot to see in the outline (after that the user should really use the shell to get things)
 # and this also means we'll pass less information to the client side (which makes debugging faster).
-MAX_ITEMS_TO_HANDLE = 300
+MAX_ITEMS_TO_HANDLE = 300 
 
 TOO_LARGE_MSG = 'Too large to show contents. Max items to show: ' + str(MAX_ITEMS_TO_HANDLE)
 TOO_LARGE_ATTR = 'Unable to handle:'
@@ -284,11 +284,11 @@ class TupleResolver: #to enumerate tuples and lists
         for item in var:
             d[format_str % i] = item
             i += 1
-
+            
             if i > MAX_ITEMS_TO_HANDLE:
                 d[TOO_LARGE_ATTR] = TOO_LARGE_MSG
                 break
-
+                
         d['__len__'] = len(var)
         return d
 
@@ -319,12 +319,12 @@ class SetResolver:
         for item in var:
             i+= 1
             d[id(item)] = item
-
+            
             if i > MAX_ITEMS_TO_HANDLE:
                 d[TOO_LARGE_ATTR] = TOO_LARGE_MSG
                 break
 
-
+            
         d['__len__'] = len(var)
         return d
 
diff --git a/python/helpers/pydev/runfiles.py b/python/helpers/pydev/runfiles.py
index c2db611055c4..3e6c0d656b3a 100644
--- a/python/helpers/pydev/runfiles.py
+++ b/python/helpers/pydev/runfiles.py
@@ -190,6 +190,8 @@ def main():
 
             argv.append('-p')
             argv.append('pydev_runfiles_pytest2')
+            if 'unittest' in sys.modules or 'unittest2' in sys.modules:
+                sys.stderr.write('pydev test runner error: imported unittest before running pytest.main\n')
             return pytest.main(argv)
 
         else:

From f611621f547a474056bc5c2670cf728c0387683d Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Thu, 23 Oct 2014 02:30:22 +0200
Subject: [PATCH 002/132] Matplotlib support in console.

---
 python/helpers/pydev/import_hook.py           |  43 ++++++
 .../pydev/pydev_ipython/matplotlibtools.py    | 133 ++++++++++++++++++
 python/helpers/pydev/pydevconsole.py          |   9 ++
 3 files changed, 185 insertions(+)
 create mode 100644 python/helpers/pydev/import_hook.py
 create mode 100644 python/helpers/pydev/pydev_ipython/matplotlibtools.py

diff --git a/python/helpers/pydev/import_hook.py b/python/helpers/pydev/import_hook.py
new file mode 100644
index 000000000000..64bc623c22fe
--- /dev/null
+++ b/python/helpers/pydev/import_hook.py
@@ -0,0 +1,43 @@
+
+import sys
+from pydevd_constants import IS_PY24, IS_PY3K
+from pydevd_constants import DictContains
+from types import ModuleType
+
+
+class ImportHookManager(ModuleType):
+    def __init__(self, name, system_import):
+        ModuleType.__init__(self, name)
+        self._system_import = system_import
+        self._modules_to_patch = {}
+
+    def add_module_name(self, module_name, activate_function):
+        self._modules_to_patch[module_name] = activate_function
+
+    def do_import(self, name, globals=None, locals=None, fromlist=None, level=-2):
+        if level == -2:
+            # fake impossible value; default value depends on version
+            if IS_PY24:
+                # the level parameter was added in version 2.5
+                return self._system_import(name, globals, locals, fromlist)
+            elif IS_PY3K:
+                # default value for level parameter in python 3
+                level = 0
+            else:
+                # default value for level parameter in other versions
+                level = -1
+        module = self._system_import(name, globals, locals, fromlist, level)
+        if DictContains(self._modules_to_patch, name):
+            self._modules_to_patch[name]() #call activate function
+            self._modules_to_patch.pop(name)
+        return module
+
+try:
+    import __builtin__ as builtins
+except ImportError:
+    import builtins
+
+import_hook_manager = ImportHookManager(__name__ + '.import_hook', builtins.__import__)
+builtins.__import__ = import_hook_manager.do_import
+sys.modules[import_hook_manager.__name__] = import_hook_manager
+del builtins
\ No newline at end of file
diff --git a/python/helpers/pydev/pydev_ipython/matplotlibtools.py b/python/helpers/pydev/pydev_ipython/matplotlibtools.py
new file mode 100644
index 000000000000..2b9f1e72209e
--- /dev/null
+++ b/python/helpers/pydev/pydev_ipython/matplotlibtools.py
@@ -0,0 +1,133 @@
+
+import sys
+from import_hook import import_hook_manager
+
+backends = {'tk': 'TkAgg',
+            'gtk': 'GTKAgg',
+            'wx': 'WXAgg',
+            'qt': 'Qt4Agg', # qt3 not supported
+            'qt4': 'Qt4Agg',
+            'osx': 'MacOSX'}
+
+# We also need a reverse backends2guis mapping that will properly choose which
+# GUI support to activate based on the desired matplotlib backend.  For the
+# most part it's just a reverse of the above dict, but we also need to add a
+# few others that map to the same GUI manually:
+backend2gui = dict(zip(backends.values(), backends.keys()))
+backend2gui['Qt4Agg'] = 'qt'
+# In the reverse mapping, there are a few extra valid matplotlib backends that
+# map to the same GUI support
+backend2gui['GTK'] = backend2gui['GTKCairo'] = 'gtk'
+backend2gui['WX'] = 'wx'
+backend2gui['CocoaAgg'] = 'osx'
+
+
+def find_gui_and_backend():
+    """Return the gui and mpl backend."""
+    matplotlib = sys.modules['matplotlib']
+    # WARNING: this assumes matplotlib 1.1 or newer!!
+    backend = matplotlib.rcParams['backend']
+    # In this case, we need to find what the appropriate gui selection call
+    # should be for IPython, so we can activate inputhook accordingly
+    gui = backend2gui.get(backend, None)
+    return gui, backend
+
+
+def is_interactive_backend(backend):
+    """ Check if backend is interactive """
+    matplotlib = sys.modules['matplotlib']
+    from matplotlib.rcsetup import interactive_bk, non_interactive_bk
+    if backend in interactive_bk:
+        return True
+    elif backend in non_interactive_bk:
+        return False
+    else:
+        return matplotlib.is_interactive()
+
+
+def patch_use(interpreter):
+    """ Patch matplotlib function 'use' """
+    matplotlib = sys.modules['matplotlib']
+    def patched_use(*args, **kwargs):
+        print "patched use!"
+        matplotlib.real_use(*args, **kwargs)
+        gui, backend = find_gui_and_backend()
+        interpreter.enableGui(gui)
+
+    setattr(matplotlib, "real_use", getattr(matplotlib, "use"))
+    setattr(matplotlib, "use", patched_use)
+
+
+def activate_matplotlib(interpreter):
+    """Set interactive to True for interactive backends."""
+    def activate_matplotlib_inner():
+        matplotlib = sys.modules['matplotlib']
+        gui, backend = find_gui_and_backend()
+        is_interactive = is_interactive_backend(backend)
+        if is_interactive:
+            interpreter.enableGui(gui)
+            if not matplotlib.is_interactive():
+                sys.stdout.write("Backend %s is interactive backend. Turning interactive mode on.\n" % backend)
+            matplotlib.interactive(True)
+        else:
+            if matplotlib.is_interactive():
+                sys.stdout.write("Backend %s is non-interactive backend. Turning interactive mode off.\n" % backend)
+            matplotlib.interactive(False)
+        patch_use(interpreter)
+    return activate_matplotlib_inner
+
+
+def init_matplotlib(interpreter):
+    import_hook_manager.add_module_name("matplotlib", activate_matplotlib(interpreter))
+
+
+def flag_calls(func):
+    """Wrap a function to detect and flag when it gets called.
+
+    This is a decorator which takes a function and wraps it in a function with
+    a 'called' attribute. wrapper.called is initialized to False.
+
+    The wrapper.called attribute is set to False right before each call to the
+    wrapped function, so if the call fails it remains False.  After the call
+    completes, wrapper.called is set to True and the output is returned.
+
+    Testing for truth in wrapper.called allows you to determine if a call to
+    func() was attempted and succeeded."""
+
+    # don't wrap twice
+    if hasattr(func, 'called'):
+        return func
+
+    def wrapper(*args,**kw):
+        wrapper.called = False
+        out = func(*args,**kw)
+        wrapper.called = True
+        return out
+
+    wrapper.called = False
+    wrapper.__doc__ = func.__doc__
+    return wrapper
+
+
+def activate_pylab():
+    pylab = sys.modules['pylab']
+    pylab.show._needmain = False
+    # We need to detect at runtime whether show() is called by the user.
+    # For this, we wrap it into a decorator which adds a 'called' flag.
+    pylab.draw_if_interactive = flag_calls(pylab.draw_if_interactive)
+
+
+def init_pylab():
+    import_hook_manager.add_module_name("pylab", activate_pylab)
+
+
+def activate_pyplot():
+    pyplot = sys.modules['matplotlib.pyplot']
+    pyplot.show._needmain = False
+    # We need to detect at runtime whether show() is called by the user.
+    # For this, we wrap it into a decorator which adds a 'called' flag.
+    pyplot.draw_if_interactive = flag_calls(pyplot.draw_if_interactive)
+
+
+def init_pyplot():
+    import_hook_manager.add_module_name("pyplot", activate_pyplot)
\ No newline at end of file
diff --git a/python/helpers/pydev/pydevconsole.py b/python/helpers/pydev/pydevconsole.py
index 9b4e2a89efba..b38847a82925 100644
--- a/python/helpers/pydev/pydevconsole.py
+++ b/python/helpers/pydev/pydevconsole.py
@@ -171,6 +171,11 @@ def process_exec_queue(interpreter):
 
     set_return_control_callback(return_control)
 
+    from pydev_ipython.matplotlibtools import init_matplotlib, init_pylab, init_pyplot
+    init_matplotlib(interpreter)
+    init_pylab()
+    init_pyplot()
+
     while 1:
         # Running the request may have changed the inputhook in use
         inputhook = get_inputhook()
@@ -322,6 +327,10 @@ def get_interpreter():
     try:
         interpreterInterface = getattr(__builtin__, 'interpreter')
     except AttributeError:
+        # fake return_controll_callback function just to prevent exception in PyCharm bebug console
+        from pydev_ipython.inputhook import set_return_control_callback
+        set_return_control_callback(lambda x: True)
+
         interpreterInterface = InterpreterInterface(None, None, threading.currentThread())
         setattr(__builtin__, 'interpreter', interpreterInterface)
 

From 557ca2cec0e89fb953e0acd2e6e30b24474c427e Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Fri, 24 Oct 2014 00:46:12 +0200
Subject: [PATCH 003/132] Attach to Process on Mac

---
 .../add_code_to_python_process.py             |  99 +++++++++++++++++-
 .../pydevd_attach_to_process/attach_x86.dylib | Bin 0 -> 18000 bytes
 .../attach_x86_64.dylib                       | Bin 0 -> 18092 bytes
 .../pydevd_attach_to_process/linux/Makefile   |  64 +++++++++++
 .../linux/attach_linux.c                      |  45 ++++----
 .../linux/lldb_threads_settrace.py            |  22 ++++
 .../pydevd_attach_to_process/linux/python.h   |   3 +-
 7 files changed, 209 insertions(+), 24 deletions(-)
 create mode 100755 python/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
 create mode 100755 python/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
 create mode 100644 python/helpers/pydev/pydevd_attach_to_process/linux/Makefile
 create mode 100644 python/helpers/pydev/pydevd_attach_to_process/linux/lldb_threads_settrace.py

diff --git a/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py b/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py
index 6a64f4e7ed41..9ca7b3903881 100644
--- a/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py
+++ b/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py
@@ -263,6 +263,10 @@ def resolve_label(process, label):
 def is_python_64bit():
     return (struct.calcsize('P') == 8)
 
+def is_mac():
+    import platform
+    return platform.system() == 'Darwin'
+
 def run_python_code_windows(pid, python_code, connect_debugger_tracing=False, show_debug_info=0):
     assert '\'' not in python_code, 'Having a single quote messes with our command.'
     from winappdbg import compat
@@ -395,11 +399,11 @@ def run_python_code_windows(pid, python_code, connect_debugger_tracing=False, sh
 def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show_debug_info=0):
     assert '\'' not in python_code, 'Having a single quote messes with our command.'
     filedir = os.path.dirname(__file__)
-    
+
     # Valid arguments for arch are i386, i386:x86-64, i386:x64-32, i8086,
     #   i386:intel, i386:x86-64:intel, i386:x64-32:intel, i386:nacl,
     #   i386:x86-64:nacl, i386:x64-32:nacl, auto.
-    
+
     if is_python_64bit():
         suffix = 'amd64'
         arch = 'i386:x86-64'
@@ -408,7 +412,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
         arch = 'i386'
 
     print('Attaching with arch: %s'% (arch,))
-        
+
     target_dll = os.path.join(filedir, 'attach_linux_%s.so' % suffix)
     target_dll = os.path.normpath(target_dll)
     if not os.path.exists(target_dll):
@@ -443,7 +447,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
         "--eval-command='call DoAttach(%s, \"%s\", %s)'" % (
             is_debug, python_code, show_debug_info)
     ])
-    
+
 
     if connect_debugger_tracing:
         cmd.extend([
@@ -472,8 +476,95 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
     return out, err
 
 
+def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_debug_info=0):
+    assert '\'' not in python_code, 'Having a single quote messes with our command.'
+    filedir = os.path.dirname(__file__)
+
+    # Valid arguments for arch are i386, i386:x86-64, i386:x64-32, i8086,
+    #   i386:intel, i386:x86-64:intel, i386:x64-32:intel, i386:nacl,
+    #   i386:x86-64:nacl, i386:x64-32:nacl, auto.
+
+    if is_python_64bit():
+        suffix = 'x86_64.dylib'
+        arch = 'i386:x86-64'
+    else:
+        suffix = 'x86.dylib'
+        arch = 'i386'
+
+    print('Attaching with arch: %s'% (arch,))
+
+    target_dll = os.path.join(filedir, 'attach_%s' % suffix)
+    target_dll = os.path.normpath(target_dll)
+    if not os.path.exists(target_dll):
+        raise RuntimeError('Could not find dll file to inject: %s' % target_dll)
+
+    lldb_threads_settrace_file = os.path.join(filedir, 'linux', 'lldb_threads_settrace.py')
+    lldb_threads_settrace_file = os.path.normpath(lldb_threads_settrace_file)
+    if not os.path.exists(lldb_threads_settrace_file):
+        raise RuntimeError('Could not find file to settrace: %s' % lldb_threads_settrace_file)
+
+    # Note: we currently don't support debug builds
+    is_debug = 0
+    # Note that the space in the beginning of each line in the multi-line is important!
+    cmd = [
+        'lldb',
+        '--no-lldbinit',  # Do not automatically parse any '.lldbinit' files.
+        # '--attach-pid',
+        # str(pid),
+        # '--arch',
+        # arch,
+        '--script-language',
+        'Python'
+        #         '--batch-silent',
+    ]
+
+
+    cmd.extend([
+        "-o 'process attach --pid %d'"%pid,
+        "-o 'expr (void*)dlopen(\"%s\", 2);'" % target_dll,
+        "-o 'expr (int)hello();'",
+        "-o 'expr (int)DoAttach(%s, \"%s\", %s);'" % (
+            is_debug, python_code, show_debug_info),
+    ])
+
+
+    if connect_debugger_tracing:
+        cmd.extend([
+            # "-o 'expr (int) SetSysTraceFunc(0, 0);'",
+            "-o 'command script import %s'" % (lldb_threads_settrace_file,),
+            ])
+
+    cmd.extend([
+        "-o 'process continue'",
+        "-o 'script import os; os._exit(1)'",
+    ])
+
+    #print ' '.join(cmd)
+
+    env = os.environ.copy()
+    # Remove the PYTHONPATH (if gdb has a builtin Python it could fail if we
+    # have the PYTHONPATH for a different python version or some forced encoding).
+    env.pop('PYTHONIOENCODING', None)
+    env.pop('PYTHONPATH', None)
+    print('Running: %s' % (' '.join(cmd)))
+    p = subprocess.Popen(
+        ' '.join(cmd),
+        shell=False,
+        env=env,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        )
+    print('Running lldb in target process.')
+    out, err = p.communicate()
+    print('stdout: %s' % (out,))
+    print('stderr: %s' % (err,))
+    return out, err
+
+
 if sys.platform == 'win32':
     run_python_code = run_python_code_windows
+elif is_mac():
+    run_python_code = run_python_code_mac
 else:
     run_python_code = run_python_code_linux
 
diff --git a/python/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib b/python/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
new file mode 100755
index 0000000000000000000000000000000000000000..ffa9f1d9db2f6ecfe18ebb8f682a1730a008e4e9
GIT binary patch
literal 18000
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
Q;Fd?WJgjHkDG*=(4WJJSCIA2c

literal 0
HcmV?d00001

diff --git a/python/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib b/python/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
new file mode 100755
index 0000000000000000000000000000000000000000..60e07417295ac9a771cf952c3395a3af136c8c5c
GIT binary patch
literal 18092
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
QG00njycv|-jSye|1HHwvxc~qF

literal 0
HcmV?d00001

diff --git a/python/helpers/pydev/pydevd_attach_to_process/linux/Makefile b/python/helpers/pydev/pydevd_attach_to_process/linux/Makefile
new file mode 100644
index 000000000000..aedfe16ee56c
--- /dev/null
+++ b/python/helpers/pydev/pydevd_attach_to_process/linux/Makefile
@@ -0,0 +1,64 @@
+# Defaults which can be overridden.
+OS = macosx
+ARCH_X86 = x86
+ARCH_X86_64 = x86_64
+
+CC=g++
+LD=libtool
+CPPFLAGS = -I.
+CFLAGS +=-fPIC -D_REENTRANT -nostartfiles
+
+ARCH_FLAG_X86 = -arch i386
+ARCH_FLAG_X86_64 = -arch x86_64
+
+INSTALL_DIR_X86 = ../os/$(OS)/$(ARCH_X86)
+INSTALL_DIR_X86_64 = ../os/$(OS)/$(ARCH_X86_64)
+INSTALL_DIR_LINUX_X86 = ../os/$(LINUX)/$(ARCH_X86)
+INSTALL_DIR_LINUX_X86_64 = ../os/$(LINUX)/$(ARCH_X86_64)
+
+ATTACH = attach_mac.so
+ATTACH_NAME_FULL_X86 = $(INSTALL_DIR_X86)/attach_x86.dylib
+ATTACH_NAME_FULL_X86_64 = $(INSTALL_DIR_X86_64)/attach_x86_64.dylib
+
+OBJS_ATTACH_X86 = attach_linux_$(ARCH_X86).o
+OBJS_ATTACH_X86_64 = attach_linux_$(ARCH_X86_64).o
+
+OBJS_X86 = $(OBJS_ATTACH_X86)
+OBJS_X86_64 = $(OBJS_ATTACH_X86_64)
+
+all: x86 x86_64
+
+x86: $(ATTACH_NAME_FULL_X86)
+
+x86_64: $(ATTACH_NAME_FULL_X86_64)
+
+linux_x86: $(ATTACH_NAME_FULL_LINUX_X86)
+linux_x86_64: $(ATTACH_NAME_FULL_LINUX_X86_64)
+
+rebuild: clean all
+
+$(ATTACH_NAME_FULL_X86): $(OBJS_ATTACH_X86)
+	mkdir -p $(INSTALL_DIR_X86)
+	$(CC) -dynamiclib  $(ARCH_FLAG_X86) -o $(ATTACH_NAME_FULL_X86) $(OBJS_ATTACH_X86) -lc
+
+$(ATTACH_NAME_FULL_X86_64): $(OBJS_ATTACH_X86_64)
+	mkdir -p $(INSTALL_DIR_X86_64)
+	$(CC) -dynamiclib  $(ARCH_FLAG_X86_64) -o $(ATTACH_NAME_FULL_X86_64) $(OBJS_ATTACH_X86_64) -lc
+
+$(ATTACH_NAME_FULL_LINUX_X86): $(OBJS_ATTACH_X86)
+	mkdir -p $(INSTALL_DIR_LINUX_X86)
+	$(CC) -m32 -g -shared -Wl,-soname,$(ATTACH) $(LDFLAGS) -o $(ATTACH_NAME_FULL_LINUX_X86) $(OBJS_ATTACH_X86)
+
+$(ATTACH_NAME_FULL_LINUX_X86_64): $(OBJS_ATTACH_X86_64)
+	mkdir -p $(INSTALL_DIR_LINUX_X86_64)
+	$(CC) -g -shared -Wl,-soname,$(ATTACH) $(LDFLAGS) -o $(ATTACH_NAME_FULL_LINUX_X86_64) $(OBJS_ATTACH_X86_64)
+
+attach_linux_$(ARCH_X86).o: attach_linux.c
+	$(CC) $(CFLAGS) $(ARCH_FLAG_X86) $(CPPFLAGS) -c -o $@ attach_linux.c
+
+attach_linux_$(ARCH_X86_64).o: attach_linux.c
+	$(CC) $(CFLAGS) $(ARCH_FLAG_X86_64) $(CPPFLAGS) -c -o $@ attach_linux.c
+
+clean :
+	$(RM) $(OBJS_X86) $(ATTACH_NAME_FULL_X86)
+	$(RM) $(OBJS_X86_64) $(ATTACH_NAME_FULL_X86_64)
diff --git a/python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c b/python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c
index f5e0c2a556ab..93302ee75460 100644
--- a/python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c
+++ b/python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c
@@ -12,19 +12,22 @@
 
 // Exported function: hello(): Just to print something and check that we've been
 // able to connect.
-extern int hello(void);
+extern "C" int hello(void);
 
 int hello()
 {
     printf("Hello world!\n");
-    void *hndl = dlsym (NULL, "PyGILState_Ensure");
+
+    void *main_hndl = dlopen(NULL, 0x2);
+
+    void *hndl = dlsym (main_hndl, "PyGILState_Ensure");
     if(hndl == NULL){
         printf("NULL\n");
 
     }else{
         printf("Worked (found PyGILState_Ensure)!\n");
-
     }
+
     printf("%d", GetPythonVersion());
 
 
@@ -36,8 +39,8 @@ int hello()
 // which are already running.
 // isDebug is pretty important! Must be true on python debug builds (python_d)
 // If this value is passed wrongly the program will crash.
-extern int SetSysTraceFunc(bool showDebugInfo, bool isDebug);
-extern int DoAttach(bool isDebug, const char *command, bool showDebugInfo);
+extern "C" int SetSysTraceFunc(bool showDebugInfo, bool isDebug);
+extern "C" int DoAttach(bool isDebug, const char *command, bool showDebugInfo);
 
 // Internal function to keep on the tracing
 int _PYDEVD_ExecWithGILSetSysStrace(bool showDebugInfo, bool isDebug);
@@ -123,7 +126,8 @@ public:
 int DoAttach(bool isDebug, const char *command, bool showDebugInfo)
 {
     Py_IsInitialized isInitFunc;
-    *(void**)(&isInitFunc) = dlsym(0, "Py_IsInitialized");
+    void *main_hndl = dlopen(NULL, 0x2);
+    *(void**)(&isInitFunc) = dlsym(main_hndl, "Py_IsInitialized");
     CHECK_NULL(isInitFunc, "Py_IsInitialized not found.\n", 1);
 
     if(!isInitFunc()){
@@ -136,7 +140,7 @@ int DoAttach(bool isDebug, const char *command, bool showDebugInfo)
     PythonVersion version = GetPythonVersion();
 
     PyInterpreterState_Head interpHeadFunc;
-    *(void**)(&interpHeadFunc) = dlsym(0, "PyInterpreterState_Head");
+    *(void**)(&interpHeadFunc) = dlsym(main_hndl, "PyInterpreterState_Head");
     CHECK_NULL(interpHeadFunc, "PyInterpreterState_Head not found.\n", 3);
 
     PyInterpreterState* head = interpHeadFunc();
@@ -148,15 +152,15 @@ int DoAttach(bool isDebug, const char *command, bool showDebugInfo)
     // have any more problems.
 
     PyGILState_Ensure pyGilStateEnsureFunc;
-    *(void**)(&pyGilStateEnsureFunc) = dlsym(0, "PyGILState_Ensure");
+    *(void**)(&pyGilStateEnsureFunc) = dlsym(main_hndl, "PyGILState_Ensure");
     CHECK_NULL(pyGilStateEnsureFunc, "PyGILState_Ensure not found.\n", 5);
 
     PyGILState_Release pyGilStateReleaseFunc;
-    *(void**)(&pyGilStateReleaseFunc) = dlsym(0, "PyGILState_Release");
+    *(void**)(&pyGilStateReleaseFunc) = dlsym(main_hndl, "PyGILState_Release");
     CHECK_NULL(pyGilStateReleaseFunc, "PyGILState_Release not found.\n", 6);
 
     PyRun_SimpleString pyRun_SimpleString;
-    *(void**)(&pyRun_SimpleString) = dlsym(0, "PyRun_SimpleString");
+    *(void**)(&pyRun_SimpleString) = dlsym(main_hndl, "PyRun_SimpleString");
     CHECK_NULL(pyRun_SimpleString, "PyRun_SimpleString not found.\n", 6);
 
     PyGILState_STATE pyGILState = pyGilStateEnsureFunc();
@@ -176,7 +180,8 @@ int SetSysTraceFunc(bool showDebugInfo, bool isDebug)
         printf("SetSysTraceFunc started.\n");
     }
     Py_IsInitialized isInitFunc;
-    *(void**)(&isInitFunc) = dlsym(0, "Py_IsInitialized");
+    void *main_hndl = dlopen(NULL, 0x2);
+    *(void**)(&isInitFunc) = dlsym(main_hndl, "Py_IsInitialized");
     CHECK_NULL(isInitFunc, "Py_IsInitialized not found.\n", 1);
 
     if(!isInitFunc()){
@@ -189,18 +194,18 @@ int SetSysTraceFunc(bool showDebugInfo, bool isDebug)
     PythonVersion version = GetPythonVersion();
 
     PyInterpreterState_Head interpHeadFunc;
-    *(void**)(&interpHeadFunc) = dlsym(0, "PyInterpreterState_Head");
+    *(void**)(&interpHeadFunc) = dlsym(main_hndl, "PyInterpreterState_Head");
     CHECK_NULL(interpHeadFunc, "PyInterpreterState_Head not found.\n", 3);
 
     PyInterpreterState* head = interpHeadFunc();
     CHECK_NULL(head, "Interpreter not initialized.\n", 4);
 
     PyGILState_Ensure pyGilStateEnsureFunc;
-    *(void**)(&pyGilStateEnsureFunc) = dlsym(0, "PyGILState_Ensure");
+    *(void**)(&pyGilStateEnsureFunc) = dlsym(main_hndl, "PyGILState_Ensure");
     CHECK_NULL(pyGilStateEnsureFunc, "PyGILState_Ensure not found.\n", 5);
 
     PyGILState_Release pyGilStateReleaseFunc;
-    *(void**)(&pyGilStateReleaseFunc) = dlsym(0, "PyGILState_Release");
+    *(void**)(&pyGilStateReleaseFunc) = dlsym(main_hndl, "PyGILState_Release");
     CHECK_NULL(pyGilStateReleaseFunc, "PyGILState_Release not found.\n", 6);
 
     PyGILState_STATE pyGILState = pyGilStateEnsureFunc();
@@ -213,17 +218,19 @@ int SetSysTraceFunc(bool showDebugInfo, bool isDebug)
 
 int _PYDEVD_ExecWithGILSetSysStrace(bool showDebugInfo, bool isDebug){
     PyBool_FromLong boolFromLongFunc;
-    *(void**)(&boolFromLongFunc) = dlsym(0, "PyBool_FromLong");
+    void *main_hndl = dlopen(NULL, 0x2);
+
+    *(void**)(&boolFromLongFunc) = dlsym(main_hndl, "PyBool_FromLong");
     CHECK_NULL(boolFromLongFunc, "PyBool_FromLong not found.\n", 7);
 
     PyObject_HasAttrString pyHasAttrFunc;
-    *(void**)(&pyHasAttrFunc) = dlsym(0, "PyObject_HasAttrString");
+    *(void**)(&pyHasAttrFunc) = dlsym(main_hndl, "PyObject_HasAttrString");
     CHECK_NULL(pyHasAttrFunc, "PyObject_HasAttrString not found.\n", 7);
 
     //Important: we need a non-blocking import here: PyImport_ImportModule
     //could end up crashing (this makes us work only from 2.6 onwards).
     PyImport_ImportModuleNoBlock pyImportModFunc;
-    *(void**)(&pyImportModFunc) = dlsym(0, "PyImport_ImportModuleNoBlock");
+    *(void**)(&pyImportModFunc) = dlsym(main_hndl, "PyImport_ImportModuleNoBlock");
     CHECK_NULL(pyImportModFunc, "PyImport_ImportModuleNoBlock not found.\n", 8);
 
 
@@ -239,7 +246,7 @@ int _PYDEVD_ExecWithGILSetSysStrace(bool showDebugInfo, bool isDebug){
 
 
     PyObject_GetAttrString pyGetAttr;
-    *(void**)(&pyGetAttr) = dlsym(0, "PyObject_GetAttrString");
+    *(void**)(&pyGetAttr) = dlsym(main_hndl, "PyObject_GetAttrString");
     CHECK_NULL(pyGetAttr, "PyObject_GetAttrString not found.\n", 8);
 
     auto PyObjectHolder settrace = PyObjectHolder(isDebug, pyGetAttr(pydevdTracingMod.ToPython(), "_original_settrace"));
@@ -252,7 +259,7 @@ int _PYDEVD_ExecWithGILSetSysStrace(bool showDebugInfo, bool isDebug){
     CHECK_NULL(getGlobalDebugger.ToPython(), "pydevd.GetGlobalDebugger null.\n", 11);
 
     PyObject_CallFunctionObjArgs call;
-    *(void**)(&call) = dlsym(0, "PyObject_CallFunctionObjArgs");
+    *(void**)(&call) = dlsym(main_hndl, "PyObject_CallFunctionObjArgs");
     CHECK_NULL(call, "PyObject_CallFunctionObjArgs not found.\n", 11);
 
     auto PyObjectHolder globalDbg = PyObjectHolder(isDebug, call(getGlobalDebugger.ToPython(), NULL));
diff --git a/python/helpers/pydev/pydevd_attach_to_process/linux/lldb_threads_settrace.py b/python/helpers/pydev/pydevd_attach_to_process/linux/lldb_threads_settrace.py
new file mode 100644
index 000000000000..f08330cfaf1a
--- /dev/null
+++ b/python/helpers/pydev/pydevd_attach_to_process/linux/lldb_threads_settrace.py
@@ -0,0 +1,22 @@
+# This file is meant to be run inside lldb as a command after
+# the attach_linux.dylib dll has already been loaded to settrace for all threads.
+def __lldb_init_module(debugger, internal_dict):
+    # Command Initialization code goes here
+    print('Startup LLDB in Python!')
+
+    try:
+        show_debug_info = 0
+        is_debug = 0
+        target = debugger.GetSelectedTarget()
+        if target:
+            process = target.GetProcess()
+            if process:
+                for t in process:
+                    # Get the first frame
+                    frame = t.GetFrameAtIndex (t.GetNumFrames()-1)
+                    if frame:
+                        print('Will settrace in: %s' % (frame,))
+                        frame.EvaluateExpression("expr (int) SetSysTraceFunc(%s, %s);" % (
+                            show_debug_info, is_debug))
+    except:
+        import traceback;traceback.print_exc()
diff --git a/python/helpers/pydev/pydevd_attach_to_process/linux/python.h b/python/helpers/pydev/pydevd_attach_to_process/linux/python.h
index f1a6d81434f9..93bfe6e413c9 100644
--- a/python/helpers/pydev/pydevd_attach_to_process/linux/python.h
+++ b/python/helpers/pydev/pydevd_attach_to_process/linux/python.h
@@ -548,7 +548,8 @@ typedef const char* (*GetVersionFunc) ();
 
 static PythonVersion GetPythonVersion() {
     GetVersionFunc versionFunc;
-    *(void**)(&versionFunc) = dlsym(0, "Py_GetVersion");
+    void *main_hndl = dlopen(NULL, 0x2);
+    *(void**)(&versionFunc) = dlsym(main_hndl, "Py_GetVersion");
     if(versionFunc != NULL) {
         const char* version = versionFunc();
         if(version != NULL && strlen(version) >= 3 && version[1] == '.') {

From 54e9434f67056fcfc45e6f820f8e82ac3880877d Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 24 Oct 2014 12:08:08 +0200
Subject: [PATCH 004/132] IDEA-76479 (tests)

---
 .../intellij/openapi/util/io/IoTestUtil.java  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java b/platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java
index 5dbe2dd1ae76..1669c5eca11a 100644
--- a/platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java
+++ b/platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java
@@ -18,6 +18,8 @@ package com.intellij.openapi.util.io;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Function;
+import com.intellij.util.ObjectUtils;
+import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -236,6 +238,34 @@ public class IoTestUtil {
     return jarFile;
   }
 
+  @NotNull
+  public static File createTestJar(@NotNull File jarFile, @NotNull final File root) throws IOException {
+    final ZipOutputStream stream = new ZipOutputStream(new FileOutputStream(jarFile));
+    try {
+      FileUtil.visitFiles(root, new Processor<File>() {
+        @Override
+        public boolean process(File file) {
+          if (file.isFile()) {
+            String path = FileUtil.toSystemIndependentName(ObjectUtils.assertNotNull(FileUtil.getRelativePath(root, file)));
+            try {
+              stream.putNextEntry(new ZipEntry(path));
+              stream.write(FileUtil.loadFileBytes(file));
+              stream.closeEntry();
+            }
+            catch (IOException e) {
+              throw new RuntimeException(e);
+            }
+          }
+          return true;
+        }
+      });
+    }
+    finally {
+      stream.close();
+    }
+    return jarFile;
+  }
+
   @NotNull
   public static File createTestDir(@NotNull String name) {
     return createTestDir(new File(FileUtil.getTempDirectory()), name);

From f4843241cca061000dbeab4ac6c50ae01e0d770f Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Fri, 24 Oct 2014 12:31:43 +0200
Subject: [PATCH 005/132] Run lldb in shell and inherit parent std handles.

---
 .../pydevd_attach_to_process/add_code_to_python_process.py  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py b/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py
index 9ca7b3903881..05a3d7957fcb 100644
--- a/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py
+++ b/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py
@@ -549,10 +549,10 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d
     print('Running: %s' % (' '.join(cmd)))
     p = subprocess.Popen(
         ' '.join(cmd),
-        shell=False,
+        shell=True,
         env=env,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
+        stdout=None,
+        stderr=None,
         )
     print('Running lldb in target process.')
     out, err = p.communicate()

From af9927e8acc0cb38010843ce1a012690d4bda552 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Fri, 24 Oct 2014 14:39:40 +0200
Subject: [PATCH 006/132] New lines.

---
 .../pydev/pydevd_attach_to_process/linux/attach_linux.c       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c b/python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c
index 93302ee75460..46b170f90404 100644
--- a/python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c
+++ b/python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c
@@ -239,7 +239,7 @@ int _PYDEVD_ExecWithGILSetSysStrace(bool showDebugInfo, bool isDebug){
 
     if(!pyHasAttrFunc(pydevdTracingMod.ToPython(), "_original_settrace")){
         if(showDebugInfo){
-            printf("pydevd_tracing module has no _original_settrace! ");
+            printf("pydevd_tracing module has no _original_settrace!\n");
         }
         return 8;
     }
@@ -277,7 +277,7 @@ int _PYDEVD_ExecWithGILSetSysStrace(bool showDebugInfo, bool isDebug){
     
     DecRef(call(settrace.ToPython(), traceFunc.ToPython(), NULL), isDebug);
     if(showDebugInfo){
-        printf("sys.settrace(pydevd.GetGlobalDebugger().trace_dispatch) worked.");
+        printf("sys.settrace(pydevd.GetGlobalDebugger().trace_dispatch) worked.\n");
     }
 
     return 0;

From bd7af104e054f8458234d00c0e4c5206acc5f435 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 24 Oct 2014 16:47:34 +0200
Subject: [PATCH 007/132] IDEA-76479 (group inter-type declarations and targets
 for compilation)

---
 .../jps/builders/java/dependencyView/Mappings.java         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
index add3dfca0fbb..3274a7ef896c 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
@@ -2347,6 +2347,13 @@ public class Mappings {
     }
   }
 
+  @Nullable
+  public Collection<File> getClassSources(int className) {
+    synchronized (myLock) {
+      return myClassToSourceFile.get(className);
+    }
+  }
+
   public void close() {
     synchronized (myLock) {
       myClassToSubclasses.close();

From 82b625a88a3eed0f69ab0513504b3d44e5fe00f6 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Fri, 24 Oct 2014 14:28:43 +0200
Subject: [PATCH 008/132] use ArrayList instead of LinkedList

---
 .../org/intellij/lang/regexp/_RegExLexer.java   | 17 +++++++++--------
 .../org/intellij/lang/regexp/regexp-lexer.flex  | 14 ++++++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java b/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
index b751ab59ba48..c8d3b4c482cf 100644
--- a/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
+++ b/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
@@ -1,20 +1,21 @@
-/* The following code was generated by JFlex 1.4.3 on 10/24/14 12:41 PM */
+/* The following code was generated by JFlex 1.4.3 on 10/24/14 2:25 PM */
 
 /* It's an automatically generated code. Do not modify it. */
 package org.intellij.lang.regexp;
 
 import com.intellij.lexer.FlexLexer;
-import com.intellij.psi.tree.IElementType;
-import java.util.LinkedList;
-import java.util.EnumSet;
 import com.intellij.psi.StringEscapesTokenTypes;
+import com.intellij.psi.tree.IElementType;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
 
 @SuppressWarnings("ALL")
 
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 10/24/14 12:41 PM from the specification file
+ * on 10/24/14 2:25 PM from the specification file
  * <tt>/Users/bas/Projects/IntelliJ IDEA Ultimate/tools/lexer/../../community/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex</tt>
  */
 class _RegExLexer implements FlexLexer {
@@ -404,7 +405,7 @@ class _RegExLexer implements FlexLexer {
 
   /* user code: */
     // This adds support for nested states. I'm no JFlex pro, so maybe this is overkill, but it works quite well.
-    private final LinkedList<Integer> states = new LinkedList();
+    private final ArrayList<Integer> states = new ArrayList();
 
     // This was an idea to use the regex implementation for XML schema regexes (which use a slightly different syntax)
     // as well, but is currently unfinished as it requires to tweak more places than just the lexer.
@@ -433,11 +434,11 @@ class _RegExLexer implements FlexLexer {
     }
 
     private void yypushstate(int state) {
-        states.addFirst(yystate());
+        states.add(yystate());
         yybegin(state);
     }
     private void yypopstate() {
-        final int state = states.removeFirst();
+        final int state = states.remove(states.size() - 1);
         yybegin(state);
     }
 
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
index a40cd5a6291d..e6547a56a939 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
+++ b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
@@ -2,10 +2,11 @@
 package org.intellij.lang.regexp;
 
 import com.intellij.lexer.FlexLexer;
-import com.intellij.psi.tree.IElementType;
-import java.util.LinkedList;
-import java.util.EnumSet;
 import com.intellij.psi.StringEscapesTokenTypes;
+import com.intellij.psi.tree.IElementType;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
 
 @SuppressWarnings("ALL")
 %%
@@ -20,7 +21,7 @@ import com.intellij.psi.StringEscapesTokenTypes;
 
 %{
     // This adds support for nested states. I'm no JFlex pro, so maybe this is overkill, but it works quite well.
-    private final LinkedList<Integer> states = new LinkedList();
+    private final ArrayList<Integer> states = new ArrayList();
 
     // This was an idea to use the regex implementation for XML schema regexes (which use a slightly different syntax)
     // as well, but is currently unfinished as it requires to tweak more places than just the lexer.
@@ -49,11 +50,12 @@ import com.intellij.psi.StringEscapesTokenTypes;
     }
 
     private void yypushstate(int state) {
-        states.addFirst(yystate());
+        states.add(yystate());
         yybegin(state);
     }
+
     private void yypopstate() {
-        final int state = states.removeFirst();
+        final int state = states.remove(states.size() - 1);
         yybegin(state);
     }
 

From fb488021e879019c11ab973776df081315f823d3 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Fri, 24 Oct 2014 16:42:39 +0200
Subject: [PATCH 009/132] IDEA-27062 (Incorrect "Unresolved Backreference"
 error in regex String literal)

---
 .../org/intellij/lang/regexp/_RegExLexer.java | 160 ++++++++++--------
 .../intellij/lang/regexp/regexp-lexer.flex    |  19 ++-
 RegExpSupport/testData/RETest.xml             |   8 +
 3 files changed, 106 insertions(+), 81 deletions(-)

diff --git a/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java b/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
index c8d3b4c482cf..531087761da2 100644
--- a/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
+++ b/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.3 on 10/24/14 2:25 PM */
+/* The following code was generated by JFlex 1.4.3 on 10/24/14 4:28 PM */
 
 /* It's an automatically generated code. Do not modify it. */
 package org.intellij.lang.regexp;
@@ -15,7 +15,7 @@ import java.util.EnumSet;
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 10/24/14 2:25 PM from the specification file
+ * on 10/24/14 4:28 PM from the specification file
  * <tt>/Users/bas/Projects/IntelliJ IDEA Ultimate/tools/lexer/../../community/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex</tt>
  */
 class _RegExLexer implements FlexLexer {
@@ -411,6 +411,7 @@ class _RegExLexer implements FlexLexer {
     // as well, but is currently unfinished as it requires to tweak more places than just the lexer.
     private boolean xmlSchemaMode;
 
+    private int capturingGroupCount = 0;
 
     private boolean allowDanglingMetacharacters;
     private boolean allowNestedCharacterClasses;
@@ -437,6 +438,7 @@ class _RegExLexer implements FlexLexer {
         states.add(yystate());
         yybegin(state);
     }
+
     private void yypopstate() {
         final int state = states.remove(states.size() - 1);
         yybegin(state);
@@ -748,94 +750,85 @@ class _RegExLexer implements FlexLexer {
           { yybegin(YYINITIAL); return RegExpTT.GROUP_END;
           }
         case 88: break;
-        case 5: 
-          { return RegExpTT.GROUP_BEGIN;
-          }
-        case 89: break;
         case 37: 
           { yybegin(YYINITIAL); return RegExpTT.COLON;
           }
-        case 90: break;
+        case 89: break;
         case 6: 
           { return RegExpTT.GROUP_END;
           }
-        case 91: break;
+        case 90: break;
         case 25: 
           { assert false : yytext();
           }
-        case 92: break;
+        case 91: break;
         case 18: 
           { return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CHARACTER;
           }
-        case 93: break;
+        case 92: break;
         case 46: 
           { return commentMode ? RegExpTT.CHARACTER : RegExpTT.REDUNDANT_ESCAPE;
           }
-        case 94: break;
+        case 93: break;
         case 23: 
           { return RegExpTT.NAME;
           }
-        case 95: break;
-        case 74: 
-          { if (allowOctalNoLeadingZero) return RegExpTT.OCT_CHAR;
-                                return yystate() != CLASS2 ? RegExpTT.BACKREF : RegExpTT.ESC_CHARACTER;
-          }
-        case 96: break;
+        case 94: break;
         case 29: 
           { yypopstate(); return RegExpTT.CLASS_END;
           }
-        case 97: break;
+        case 95: break;
         case 34: 
           { yybegin(YYINITIAL); return RegExpTT.BAD_CHARACTER;
           }
-        case 98: break;
+        case 96: break;
         case 52: 
           { yypushstate(QUOTED); return RegExpTT.QUOTE_BEGIN;
           }
-        case 99: break;
+        case 97: break;
         case 21: 
           { return RegExpTT.NUMBER;
           }
-        case 100: break;
+        case 98: break;
         case 4: 
           { return RegExpTT.DOT;
           }
-        case 101: break;
+        case 99: break;
         case 72: 
           { return RegExpTT.NEG_LOOKBEHIND;
           }
-        case 102: break;
+        case 100: break;
         case 33: 
           { yypopstate(); if (allowCategoryShorthand) return RegExpTT.CATEGORY_SHORT_HAND; else yypushback(1);
           }
-        case 103: break;
+        case 101: break;
         case 44: 
           { return (allowOctalNoLeadingZero ? RegExpTT.OCT_CHAR : RegExpTT.BAD_OCT_VALUE);
           }
-        case 104: break;
+        case 102: break;
         case 41: 
           // lookahead expression with fixed base length
           zzMarkedPos = zzStartRead + 1;
           { yypushstate(CLASS1);
                             return RegExpTT.CLASS_BEGIN;
           }
-        case 105: break;
+        case 103: break;
         case 63: 
           { return RegExpTT.NEG_LOOKAHEAD;
           }
-        case 106: break;
+        case 104: break;
         case 10: 
           { return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CTRL_CHARACTER;
           }
-        case 107: break;
+        case 105: break;
         case 61: 
           { return RegExpTT.NON_CAPT_GROUP;
           }
-        case 108: break;
+        case 106: break;
         case 65: 
           { yybegin(QUOTED_NAMED_GROUP); return RegExpTT.RUBY_QUOTED_NAMED_GROUP;
           }
-        case 109: break;
+        case 107: break;
         case 66: 
           // lookahead expression with fixed base length
           zzMarkedPos = zzStartRead + 1;
@@ -847,7 +840,7 @@ class _RegExLexer implements FlexLexer {
                               }
                               return RegExpTT.CLASS_BEGIN;
           }
-        case 110: break;
+        case 108: break;
         case 28: 
           { if (allowNestedCharacterClasses) {
                            yypushstate(CLASS2);
@@ -855,72 +848,80 @@ class _RegExLexer implements FlexLexer {
                         }
                         return RegExpTT.CHARACTER;
           }
-        case 111: break;
+        case 109: break;
         case 19: 
           { if (commentMode) { yypushstate(COMMENT); return RegExpTT.COMMENT; } else return RegExpTT.CHARACTER;
           }
-        case 112: break;
+        case 110: break;
         case 51: 
           { yypushstate(PROP); return RegExpTT.PROPERTY;
           }
-        case 113: break;
+        case 111: break;
         case 8: 
           { yypushstate(CLASS2);
                             return RegExpTT.CLASS_BEGIN;
           }
-        case 114: break;
+        case 112: break;
         case 71: 
           { return RegExpTT.POS_LOOKBEHIND;
           }
-        case 115: break;
-        case 43: 
-          { return yystate() != CLASS2 ? RegExpTT.BACKREF : RegExpTT.ESC_CHARACTER;
-          }
-        case 116: break;
+        case 113: break;
         case 73: 
           { return RegExpTT.HEX_CHAR;
           }
-        case 117: break;
+        case 114: break;
         case 1: 
           { handleOptions(); return RegExpTT.OPTIONS_ON;
           }
-        case 118: break;
+        case 115: break;
+        case 43: 
+          { if (yystate() == CLASS2) return RegExpTT.ESC_CHARACTER;
+                                while (yylength() > 2 && Integer.parseInt(yytext().toString().substring(1)) > capturingGroupCount) {
+                                  yypushback(1);
+                                }
+                                return RegExpTT.BACKREF;
+          }
+        case 116: break;
         case 59: 
           { return allowNestedCharacterClasses ? RegExpTT.ANDAND : RegExpTT.CHARACTER;
           }
-        case 119: break;
+        case 117: break;
         case 2: 
           { yypopstate(); return RegExpTT.COMMENT;
           }
-        case 120: break;
+        case 118: break;
         case 17: 
           { return RegExpTT.MINUS;
           }
-        case 121: break;
+        case 119: break;
         case 47: 
           { return RegExpTT.ESC_CTRL_CHARACTER;
           }
-        case 122: break;
+        case 120: break;
         case 32: 
           { yypopstate(); yypushstate(EMBRACED); return RegExpTT.LBRACE;
           }
-        case 123: break;
+        case 121: break;
         case 13: 
           { return RegExpTT.QUEST;
           }
-        case 124: break;
+        case 122: break;
+        case 5: 
+          { capturingGroupCount++; return RegExpTT.GROUP_BEGIN;
+          }
+        case 123: break;
         case 15: 
           { return RegExpTT.PLUS;
           }
-        case 125: break;
+        case 124: break;
         case 67: 
           { return RegExpTT.OCT_CHAR;
           }
-        case 126: break;
+        case 125: break;
         case 39: 
           { yybegin(YYINITIAL); return RegExpTT.QUOTE;
           }
-        case 127: break;
+        case 126: break;
         case 20: 
           { if (allowDanglingMetacharacters) {
                           yypopstate(); yypushback(1); 
@@ -928,15 +929,15 @@ class _RegExLexer implements FlexLexer {
                           return RegExpTT.BAD_CHARACTER;
                         }
           }
-        case 128: break;
+        case 127: break;
         case 31: 
           { yypopstate(); yypushback(1);
           }
-        case 129: break;
+        case 128: break;
         case 27: 
           { yybegin(CLASS1); return RegExpTT.CARET;
           }
-        case 130: break;
+        case 129: break;
         case 57: 
           // lookahead expression with fixed base length
           zzMarkedPos = zzStartRead + 1;
@@ -946,91 +947,100 @@ class _RegExLexer implements FlexLexer {
                             }
                             return RegExpTT.CHARACTER;
           }
-        case 131: break;
+        case 130: break;
         case 58: 
           { if (!allowNestedCharacterClasses) return RegExpTT.CHARACTER;
                                 return RegExpTT.REDUNDANT_ESCAPE;
           }
-        case 132: break;
+        case 131: break;
         case 38: 
           { yybegin(YYINITIAL); return RegExpTT.GT;
           }
-        case 133: break;
+        case 132: break;
         case 69: 
           { yybegin(PY_NAMED_GROUP_REF); return RegExpTT.PYTHON_NAMED_GROUP_REF;
           }
-        case 134: break;
+        case 133: break;
         case 16: 
           { return RegExpTT.UNION;
           }
-        case 135: break;
+        case 134: break;
         case 3: 
           { return RegExpTT.CHARACTER;
           }
-        case 136: break;
+        case 135: break;
         case 64: 
           { yybegin(NAMED_GROUP); return RegExpTT.RUBY_NAMED_GROUP;
           }
-        case 137: break;
+        case 136: break;
         case 40: 
           { yybegin(OPTIONS); return RegExpTT.SET_OPTIONS;
           }
-        case 138: break;
+        case 137: break;
         case 26: 
           { yybegin(CLASS2); return RegExpTT.CHARACTER;
           }
-        case 139: break;
+        case 138: break;
         case 68: 
           { if (xmlSchemaMode) { yypushback(1); return RegExpTT.CHAR_CLASS; } else return RegExpTT.CTRL;
           }
-        case 140: break;
+        case 139: break;
         case 30: 
           { return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.ESC_CHARACTER;
           }
-        case 141: break;
+        case 140: break;
         case 12: 
           { return RegExpTT.DOLLAR;
           }
-        case 142: break;
+        case 141: break;
         case 50: 
           { if (xmlSchemaMode) return RegExpTT.CHAR_CLASS; else return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN;
           }
-        case 143: break;
+        case 142: break;
         case 42: 
           { return RegExpTT.REDUNDANT_ESCAPE;
           }
-        case 144: break;
+        case 143: break;
         case 55: 
           { return (allowHexDigitClass || allowHorizontalWhitespaceClass ? RegExpTT.CHAR_CLASS : StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN);
           }
-        case 145: break;
+        case 144: break;
         case 48: 
           { return yystate() != CLASS2 ? RegExpTT.BOUNDARY : RegExpTT.ESC_CHARACTER;
           }
-        case 146: break;
+        case 145: break;
         case 22: 
           { yypopstate(); return RegExpTT.RBRACE;
           }
-        case 147: break;
+        case 146: break;
         case 54: 
           { return StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN;
           }
-        case 148: break;
+        case 147: break;
         case 53: 
           { return RegExpTT.BAD_HEX_VALUE;
           }
-        case 149: break;
+        case 148: break;
         case 9: 
           { return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN;
           }
-        case 150: break;
+        case 149: break;
         case 11: 
           { return RegExpTT.CARET;
           }
-        case 151: break;
+        case 150: break;
         case 45: 
           { return RegExpTT.ESC_CHARACTER;
           }
+        case 151: break;
+        case 74: 
+          { if (allowOctalNoLeadingZero) return RegExpTT.OCT_CHAR;
+                                if (yystate() == CLASS2) return RegExpTT.ESC_CHARACTER;
+                                while (yylength() > 2 && Integer.parseInt(yytext().toString().substring(1)) > capturingGroupCount) {
+                                  yypushback(1);
+                                }
+                                return RegExpTT.BACKREF;
+          }
         case 152: break;
         default:
           if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
index e6547a56a939..d429bd24c6ac 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
+++ b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
@@ -27,6 +27,7 @@ import java.util.EnumSet;
     // as well, but is currently unfinished as it requires to tweak more places than just the lexer.
     private boolean xmlSchemaMode;
 
+    private int capturingGroupCount = 0;
 
     private boolean allowDanglingMetacharacters;
     private boolean allowNestedCharacterClasses;
@@ -146,15 +147,21 @@ HEX_CHAR=[0-9a-fA-F]
     subexpressions exist at that point in the regular expression, otherwise the
     parser will drop digits until the number is smaller or equal to the existing
     number of groups or it is one digit."
-
-    So, for 100% compatibility, backrefs > 9 should be resolved by the parser, but
-    I'm not sure if it's worth the effort - at least not atm.
 */
 {ESCAPE} [0-7]{3}             { if (allowOctalNoLeadingZero) return RegExpTT.OCT_CHAR;
-                                return yystate() != CLASS2 ? RegExpTT.BACKREF : RegExpTT.ESC_CHARACTER;
+                                if (yystate() == CLASS2) return RegExpTT.ESC_CHARACTER;
+                                while (yylength() > 2 && Integer.parseInt(yytext().toString().substring(1)) > capturingGroupCount) {
+                                  yypushback(1);
+                                }
+                                return RegExpTT.BACKREF;
                               }
 
-{ESCAPE} {DIGITS}             { return yystate() != CLASS2 ? RegExpTT.BACKREF : RegExpTT.ESC_CHARACTER; }
+{ESCAPE} {DIGITS}             { if (yystate() == CLASS2) return RegExpTT.ESC_CHARACTER;
+                                while (yylength() > 2 && Integer.parseInt(yytext().toString().substring(1)) > capturingGroupCount) {
+                                  yypushback(1);
+                                }
+                                return RegExpTT.BACKREF;
+                              }
 
 {ESCAPE}  "-"                 { return RegExpTT.ESC_CHARACTER; }
 {ESCAPE}  {META}              { return RegExpTT.ESC_CHARACTER; }
@@ -258,7 +265,7 @@ HEX_CHAR=[0-9a-fA-F]
 
 
 <YYINITIAL> {
-  {LPAREN}      { return RegExpTT.GROUP_BEGIN; }
+  {LPAREN}      { capturingGroupCount++; return RegExpTT.GROUP_BEGIN; }
   {RPAREN}      { return RegExpTT.GROUP_END;   }
 
   "|"           { return RegExpTT.UNION;  }
diff --git a/RegExpSupport/testData/RETest.xml b/RegExpSupport/testData/RETest.xml
index 88ace1f83294..f42b9af45c51 100644
--- a/RegExpSupport/testData/RETest.xml
+++ b/RegExpSupport/testData/RETest.xml
@@ -730,6 +730,14 @@
       <pattern>([ab]+)=\1</pattern>
       <expected>OK</expected>
     </test>
+    <test>
+      <pattern>(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)\105</pattern>
+      <expected>OK</expected>
+    </test>
+    <test>
+      <pattern>(.)\11</pattern>
+      <expected>OK</expected>
+    </test>
     <test verify="false">
       <pattern>([ab]+)=\2</pattern>
       <expected>ERR</expected>

From 5103ffcb76d73f0feb8d21a4b7a49e31c4edb1ce Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Fri, 24 Oct 2014 19:06:18 +0400
Subject: [PATCH 010/132] IDEA-131878 Settings: texts and layout in Updates

---
 .../impl/UpdatesSettingsPanel.form            | 20 ++++++-------------
 .../src/messages/IdeBundle.properties         | 10 ++++------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form
index 35f47c9eb6de..dd37637ea671 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.openapi.updateSettings.impl.UpdateSettingsConfigurable.UpdatesSettingsPanel">
-  <grid id="5aa87" binding="myPanel" layout-manager="GridLayoutManager" row-count="6" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="5aa87" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="62" y="37" width="816" height="434"/>
@@ -8,18 +8,10 @@
     <properties/>
     <border type="none"/>
     <children>
-      <component id="fd85b" class="javax.swing.JLabel">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text resource-bundle="messages/IdeBundle" key="updates.settings.caption.1"/>
-        </properties>
-      </component>
       <grid id="e409a" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="10" left="0" bottom="20" right="0"/>
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -83,7 +75,7 @@
       </component>
       <component id="db163" class="javax.swing.JLabel">
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text resource-bundle="messages/IdeBundle" key="updates.settings.last.check"/>
@@ -91,7 +83,7 @@
       </component>
       <component id="6b5cb" class="javax.swing.JLabel" binding="myLastCheckedDate">
         <constraints>
-          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="01.05.2005"/>
@@ -99,12 +91,12 @@
       </component>
       <hspacer id="fdc69">
         <constraints>
-          <grid row="4" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
       <vspacer id="3d6db">
         <constraints>
-          <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
     </children>
diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties
index 8dbf428793f1..ee5f49e1fb53 100644
--- a/platform/platform-resources-en/src/messages/IdeBundle.properties
+++ b/platform/platform-resources-en/src/messages/IdeBundle.properties
@@ -923,13 +923,11 @@ updates.version.info={0} (build {1})
 updates.write.protected={0} does not have write access to {1}. Please run it by a privileged user to update.
 updates.settings.title=Updates
 updates.last.check.never=Never
-updates.settings.caption.1=<html>$FULLNAME$ can automatically check for new and updated versions of itself, \
-  using your internet connection (when active).<html>
 updates.settings.check.now.button=&Check Now
-updates.settings.checkbox=Check for updates in channel
-updates.settings.build.number=     Build number:
-updates.settings.current.version=Current version\:
-updates.settings.last.check=Last checked for updates:
+updates.settings.checkbox=Automatically check updates for
+updates.settings.build.number=Build number:
+updates.settings.current.version=Current version:
+updates.settings.last.check=Last checked:
 
 hierarchy.method.next.occurence.name=Go to next method
 hierarchy.method.prev.occurence.name=Go to previous method

From 14cf17c63b776dde7ee294922acc0119ad45bdab Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Fri, 24 Oct 2014 17:38:08 +0200
Subject: [PATCH 011/132] Correct detach.

---
 .../pydevd_attach_to_process/add_code_to_python_process.py     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py b/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py
index 05a3d7957fcb..51264ceea75e 100644
--- a/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py
+++ b/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py
@@ -536,7 +536,8 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d
 
     cmd.extend([
         "-o 'process continue'",
-        "-o 'script import os; os._exit(1)'",
+        "-o 'process detach'",
+        # "-o 'script import os; os._exit(1)'",
     ])
 
     #print ' '.join(cmd)

From bf66372b2b5b49ba4a93d8ac4f573ceb7857f5b8 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Fri, 24 Oct 2014 17:38:36 +0200
Subject: [PATCH 012/132] Fix attach in case of multiple threads.

---
 .../linux/lldb_threads_settrace.py            | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/python/helpers/pydev/pydevd_attach_to_process/linux/lldb_threads_settrace.py b/python/helpers/pydev/pydevd_attach_to_process/linux/lldb_threads_settrace.py
index f08330cfaf1a..b457e1547cd2 100644
--- a/python/helpers/pydev/pydevd_attach_to_process/linux/lldb_threads_settrace.py
+++ b/python/helpers/pydev/pydevd_attach_to_process/linux/lldb_threads_settrace.py
@@ -3,20 +3,34 @@
 def __lldb_init_module(debugger, internal_dict):
     # Command Initialization code goes here
     print('Startup LLDB in Python!')
+    import lldb
 
     try:
-        show_debug_info = 0
+        show_debug_info = 1
         is_debug = 0
         target = debugger.GetSelectedTarget()
         if target:
             process = target.GetProcess()
             if process:
-                for t in process:
+                for thread in process:
                     # Get the first frame
-                    frame = t.GetFrameAtIndex (t.GetNumFrames()-1)
-                    if frame:
-                        print('Will settrace in: %s' % (frame,))
-                        frame.EvaluateExpression("expr (int) SetSysTraceFunc(%s, %s);" % (
-                            show_debug_info, is_debug))
+                    print('Thread %s, suspended %s\n'%(thread, thread.IsStopped()))
+
+                    process.SetSelectedThread(thread)
+
+                    if not thread.IsStopped():
+                        error = process.Stop()
+                        print(error)
+
+                    if thread:
+                        frame = thread.GetSelectedFrame()
+                        if frame:
+                            print('Will settrace in: %s' % (frame,))
+                            res = frame.EvaluateExpression("(int) SetSysTraceFunc(%s, %s)" % (
+                                show_debug_info, is_debug), lldb.eDynamicCanRunTarget)
+                            error = res.GetError()
+                            if error:
+                                print(error)
+                    thread.Resume()
     except:
         import traceback;traceback.print_exc()

From c877877cf18091125c09a542482ccc2d3e563229 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 24 Oct 2014 19:41:55 +0400
Subject: [PATCH 013/132] [vcs] Fix VcsRootScanner initialization

Don't start in the post-startup activity: mappings are already
initialized at that time => VcsRootScanner will never be "ready" to
scheduleScan.

Instead register the vcs initialization request with the least
priority: at that time both the Project and mappings are initialized,
and scan can be performed right away.
---
 .../vcs/impl/ProjectLevelVcsManagerImpl.java  |  6 ++++
 .../openapi/vcs/roots/VcsRootScanner.java     | 35 +++----------------
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
index 84ca76e1d89f..45f550271825 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
@@ -243,6 +243,12 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
         else {
           myContentManager = ContentFactory.SERVICE.getInstance().createContentManager(true, myProject);
         }
+      }
+    });
+
+    addInitializationRequest(VcsInitObject.AFTER_COMMON, new Runnable() {
+      @Override
+      public void run() {
         if (!ApplicationManager.getApplication().isUnitTestMode()) {
           VcsRootChecker[] checkers = Extensions.getExtensions(VcsRootChecker.EXTENSION_POINT_NAME);
           if (checkers.length != 0) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootScanner.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootScanner.java
index 8ee2f551fd80..b052d0bd78ff 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootScanner.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootScanner.java
@@ -16,11 +16,9 @@
 package com.intellij.openapi.vcs.roots;
 
 import com.intellij.ProjectTopics;
-import com.intellij.openapi.project.DumbAwareRunnable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ModuleRootEvent;
 import com.intellij.openapi.roots.ModuleRootListener;
-import com.intellij.openapi.startup.StartupManager;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.VcsListener;
 import com.intellij.openapi.vcs.VcsRootChecker;
@@ -34,36 +32,22 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-/**
- * @author Nadya Zabrodina
- */
 public class VcsRootScanner implements BulkFileListener, ModuleRootListener, VcsListener {
 
   @NotNull private final VcsRootProblemNotifier myRootProblemNotifier;
   @NotNull private final VcsRootChecker[] myCheckers;
 
-  private volatile boolean myProjectIsInitialized;
-  private volatile boolean myMappingsAreReady;
-
   @NotNull private final Alarm myAlarm;
   private static final long WAIT_BEFORE_SCAN = TimeUnit.SECONDS.toMillis(1);
 
   public static void start(@NotNull Project project, @NotNull VcsRootChecker[] checkers) {
-    new VcsRootScanner(project, checkers);
+    new VcsRootScanner(project, checkers).scheduleScan();
   }
 
   private VcsRootScanner(@NotNull Project project, @NotNull VcsRootChecker[] checkers) {
     myRootProblemNotifier = VcsRootProblemNotifier.getInstance(project);
     myCheckers = checkers;
 
-    StartupManager.getInstance(project).runWhenProjectIsInitialized(new DumbAwareRunnable() {
-      @Override
-      public void run() {
-        myProjectIsInitialized = true;
-        scanIfReady();
-      }
-    });
-
     final MessageBus messageBus = project.getMessageBus();
     messageBus.connect().subscribe(ProjectLevelVcsManager.VCS_CONFIGURATION_CHANGED, this);
     messageBus.connect().subscribe(VirtualFileManager.VFS_CHANGES, this);
@@ -82,7 +66,7 @@ public class VcsRootScanner implements BulkFileListener, ModuleRootListener, Vcs
       String filePath = event.getPath();
       for (VcsRootChecker checker : myCheckers) {
         if (checker.isVcsDir(filePath)) {
-          scanIfReady();
+          scheduleScan();
           break;
         }
       }
@@ -95,23 +79,12 @@ public class VcsRootScanner implements BulkFileListener, ModuleRootListener, Vcs
 
   @Override
   public void rootsChanged(ModuleRootEvent event) {
-    scanIfReady();
+    scheduleScan();
   }
 
   @Override
   public void directoryMappingChanged() {
-    myMappingsAreReady = true;
-    scanIfReady();
-  }
-
-  private void scanIfReady() {
-    if (readyToScan()) {
-      scheduleScan();
-    }
-  }
-
-  private boolean readyToScan() {
-    return myMappingsAreReady && myProjectIsInitialized;
+    scheduleScan();
   }
 
   private void scheduleScan() {

From f316d3bb46dcdbbbcafb5d97e36642e5f088fd12 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 24 Oct 2014 19:43:01 +0400
Subject: [PATCH 014/132] [vcs] IDEA-95947 Don't notify about the same
 unregistered root twice

---
 .../openapi/vcs/roots/VcsRootProblemNotifier.java         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
index fcafc513fcb8..3b8100978094 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
@@ -28,12 +28,14 @@ import com.intellij.openapi.vcs.VcsDirectoryMapping;
 import com.intellij.openapi.vcs.VcsNotifier;
 import com.intellij.openapi.vcs.VcsRootError;
 import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.event.HyperlinkEvent;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Set;
 
 import static com.intellij.openapi.util.text.StringUtil.pluralize;
 
@@ -46,6 +48,7 @@ public class VcsRootProblemNotifier {
 
   private final @NotNull Project myProject;
   private final @NotNull VcsConfiguration mySettings;
+  @NotNull private final Set<VcsRootError> myReportedUnregisteredRoots = ContainerUtil.newHashSet();
 
   private @Nullable Notification myNotification;
   private final @NotNull Object NOTIFICATION_LOCK = new Object();
@@ -78,6 +81,11 @@ public class VcsRootProblemNotifier {
     String title = makeTitle(unregisteredRoots, invalidRoots);
     String description = makeDescription(unregisteredRoots, invalidRoots);
 
+    if (myReportedUnregisteredRoots.containsAll(unregisteredRoots) && invalidRoots.isEmpty()) {
+      return;
+    }
+    myReportedUnregisteredRoots.addAll(unregisteredRoots);
+
     synchronized (NOTIFICATION_LOCK) {
       expireNotification();
       NotificationListener listener = new MyNotificationListener(myProject, mySettings);

From d0ecb2efd295bf6a3168c6fafbf6a1d0b768bf0d Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Fri, 24 Oct 2014 19:48:50 +0400
Subject: [PATCH 015/132] Fix the layout of the Usage Statistics configurable

---
 .../configurable/StatisticsConfigurable.java  |  3 ++-
 .../StatisticsConfigurationComponent.form     | 22 +++++--------------
 .../StatisticsConfigurationComponent.java     |  5 ++---
 .../src/messages/StatisticsBundle.properties  |  7 ++++--
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurable.java b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurable.java
index 0a70d05c708f..94a12bb944fd 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurable.java
@@ -16,6 +16,7 @@
 package com.intellij.internal.statistic.configurable;
 
 import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent;
+import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import org.jetbrains.annotations.Nls;
@@ -25,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
-public class StatisticsConfigurable implements SearchableConfigurable {
+public class StatisticsConfigurable implements SearchableConfigurable, Configurable.NoScroll {
 
     private boolean modifiedByDefault;
 
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form
index 5a20875acb0f..6015b65620e0 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="335" height="259"/>
+      <xy x="20" y="20" width="335" height="268"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -38,8 +38,8 @@
                   <text value=""/>
                 </properties>
               </component>
-              <grid id="d4bdc" binding="myRadioButtonPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                <margin top="0" left="0" bottom="0" right="0"/>
+              <grid id="d4bdc" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                <margin top="0" left="0" bottom="10" right="0"/>
                 <constraints>
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="2" use-parent-layout="false"/>
                 </constraints>
@@ -75,22 +75,12 @@
               </grid>
             </children>
           </grid>
-          <grid id="edf0a" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-            <margin top="30" left="0" bottom="0" right="0"/>
+          <component id="67819" class="javax.swing.JLabel" binding="myLabel">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-            <border type="none"/>
-            <children>
-              <component id="67819" class="javax.swing.JLabel" binding="myLabel">
-                <constraints>
-                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties/>
-              </component>
-            </children>
-          </grid>
+          </component>
         </children>
       </grid>
       <component id="9c047" class="javax.swing.JLabel" binding="myTitle">
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.java b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.java
index 6aa0329a831e..15d3e63727f0 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.java
@@ -21,7 +21,7 @@ import com.intellij.internal.statistic.connect.StatisticsService;
 import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent;
 import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.application.ApplicationNamesInfo;
-import com.intellij.util.ui.UIUtil;
+import com.intellij.ui.RelativeFont;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -37,14 +37,13 @@ public class StatisticsConfigurationComponent {
   private JRadioButton myMonthlyRadioButton;
   private JRadioButton myWeeklyRadioButton;
   private JLabel myLabel;
-  private JPanel myRadioButtonPanel;
 
   public StatisticsConfigurationComponent() {
     String product = ApplicationNamesInfo.getInstance().getFullProductName();
     String company = ApplicationInfo.getInstance().getCompanyName();
     myTitle.setText(StatisticsBundle.message("stats.title", product, company));
     myLabel.setText(StatisticsBundle.message("stats.config.details", company));
-    myLabel.setFont(UIUtil.getLabelFont(UIUtil.FontSize.SMALL));
+    RelativeFont.SMALL.install(myLabel);
 
     myAllowToSendUsagesCheckBox.setText(StatisticsBundle.message("stats.config.allow.send.stats.text", company));
     myAllowToSendUsagesCheckBox.addActionListener(new ActionListener() {
diff --git a/platform/platform-resources-en/src/messages/StatisticsBundle.properties b/platform/platform-resources-en/src/messages/StatisticsBundle.properties
index e7705d703990..3f37e06b648d 100644
--- a/platform/platform-resources-en/src/messages/StatisticsBundle.properties
+++ b/platform/platform-resources-en/src/messages/StatisticsBundle.properties
@@ -1,4 +1,7 @@
-stats.title=Help improve {0} by sending anonymous usage statistics to {1}
+stats.title=<html>Help improve {0} by sending anonymous usage statistics to {1}
 
 stats.config.allow.send.stats.text=Allow sending usage statistics to {0}
-stats.config.details=<html>We are asking your permission to send information about your plugins configuration (what is enabled <br>and what is not) and feature usage statistics (e.g. how frequently you are using code completion).<br>    This data is anonymous, does not contain any personal information, collected for use only by {0}<br> and will never be transmitted to any third party.</html>
\ No newline at end of file
+stats.config.details=<html>We are asking your permission to send information about your plugins configuration \
+  (what is enabled and what is not) and feature usage statistics (e.g. how frequently you are using code completion). \
+  This data is anonymous, does not contain any personal information, \
+  collected for use only by {0} and will never be transmitted to any third party.
\ No newline at end of file

From 4c725a50cd3cbdddb0c113656556542816c59047 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Fri, 24 Oct 2014 20:16:33 +0400
Subject: [PATCH 016/132] Fix usage of the Parent.hasOwnContent method

---
 .../openapi/options/newEditor/SettingsFilter.java         | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsFilter.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsFilter.java
index fdd4fa96aaee..0818cb6d176f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsFilter.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsFilter.java
@@ -20,6 +20,7 @@ import com.intellij.ide.ui.search.SearchableOptionsRegistrar;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurableGroup;
 import com.intellij.openapi.options.SearchableConfigurable;
+import com.intellij.openapi.options.ex.ConfigurableWrapper;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.wm.IdeFocusManager;
@@ -208,10 +209,7 @@ abstract class SettingsFilter extends ElementFilter.Active.Impl<SimpleNode> {
   }
 
   private static boolean isEmptyParent(Configurable configurable) {
-    if (configurable instanceof SearchableConfigurable.Parent) {
-      SearchableConfigurable.Parent parent = (SearchableConfigurable.Parent)configurable;
-      return !parent.hasOwnContent();
-    }
-    return false;
+    SearchableConfigurable.Parent parent = ConfigurableWrapper.cast(SearchableConfigurable.Parent.class, configurable);
+    return parent != null && !parent.hasOwnContent();
   }
 }

From 11dd3e927a08b9424b23667cc44cc927aef404d6 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 24 Oct 2014 14:26:25 +0200
Subject: [PATCH 017/132] SE gear icon (cherry picked from commit e74f1ce)

---
 .../icons/src/general/searchEverywhereGear.png  | Bin 0 -> 14657 bytes
 .../src/general/searchEverywhereGear@2x.png     | Bin 0 -> 14747 bytes
 .../general/searchEverywhereGear@2x_dark.png    | Bin 0 -> 14747 bytes
 .../src/general/searchEverywhereGear_dark.png   | Bin 0 -> 14657 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 platform/icons/src/general/searchEverywhereGear.png
 create mode 100644 platform/icons/src/general/searchEverywhereGear@2x.png
 create mode 100644 platform/icons/src/general/searchEverywhereGear@2x_dark.png
 create mode 100644 platform/icons/src/general/searchEverywhereGear_dark.png

diff --git a/platform/icons/src/general/searchEverywhereGear.png b/platform/icons/src/general/searchEverywhereGear.png
new file mode 100644
index 0000000000000000000000000000000000000000..8500a59800e70eb9991c712b80713712508038f9
GIT binary patch
literal 14657
zcmeI3Ux*t;9LMJ@_RqCf3l>`ML6<H5DK^>N{LeN?xn8clv(4Rc&C$CT?cVO>vRty8
z+uby|6QNd1EBGK5L`1McA5^pmf(Ra3q*YOT(1Q36Uu+-R7eVo%4_aq;bIC8cq+_Lz
z6G--VGvDuTW<T?rxqaCeCdUsB^bhtUga*b&vs2`{&HZj%PktZz^Oiy`n<}HTHbR^4
zcfWn;wbyqdlo-_WGtNxzu&kQpprV;`I9M-Nh#H~PzIsJb7qG+4;d$Li^S^)mDbMLz
znm-!NiMh%!F6yJp7Cy2(o>!L_)TGAm%k-z}GD%Rzj>6T;CBv5MY2M2#lh|z*c+QhJ
z3u%7H9gv&JO>)Dgg}G=j8c;<k!o`z8DJn%0(jG1(N?}0^3sN{Bg=8@)OHr=z;WPat
zN?BS#p2{9*3`hP-^F_z0$bwL-)q=Hf(6r_SDVa<PVn_&u0z?t8mkdX#2Ml|cpJX*p
z7Tc<&R~+3mI5)2{XI7mw&$|OPKaKk;SDFJEc7q+EDAbjTAO%ICn@Llfo=Vj!c~jF=
z0he$Y8;(tUQdeK4Xga1{G<yu$?Cv=*S(99@Id<3imdjm-ww;mV1VIC7SErp{s$gLX
z+h)~L@yKy<E4#Ygy`vXei_@0L?ddspT-STp+#cWNm4d%QDRQs!u!R-JwDP7|%J@|_
zxr&e*9_Ai9svDYFvv;S2PIYUkTZwR1ad3u|Vk97mflwqbg=H}=OX0^wQj;P`;ww9H
z<V;O3EUn2AA+;<=LNEtVcIF^kM^hZ-KV^YhkVjMHf@zf%C!?2@c`Q_n`IOLV1j=SX
z$-`#Jw8*q@CY%zwH3OGdWb&9{JBp#=v22Dk1a)1L3$gf|rr<~*HkU{QqOnLUpd=EZ
zfEZT`F>MYfB2vhMn9D)?n$%fSt-2efky^XM)WE(b^@OF9Lry6HjXV209imH`HA9W+
zHYv>|P_m?Oy<_YMUTkk&?I`Kqaa2((8@rn=&9CmZ=K0k;o?MT&X=O!q53-Ev?ggx+
zgtpe!w3^O_P5-|O=;sIa-ec5?*tp$>@>6-L-brk;;M5cg56zRBplowLVY{O<b4qZ}
z{F2_j27YV%(ySKi+NDgnN105@fJ{m8@JlISO<QYZUq9n6XQ}Gx;~|lJ1j+qvSYdak
zb@ujF*xhMuIj0TX$&fARO|+vKxZLyBKM{_QM+2ORMWf+pO6Y9vbWG}XT$;)1Wb4{)
zK}xZPr?aE0akiHcbTo|qQh|Ts-b(td<Pm{9oe0gxllDb!?t!};wC?CGCx+?RAdm(%
zX1J(`pn&0mG^jDdMMVS!3>Tz9jTtT~A}C<EAPs8Fa8VIK0mB7pP-BLRiU<lAE=YqK
zGh9?eP{43O8q}EKq9TF<h6~c5#tat~5fm_7kOnnoxTuJrfZ>8Ps4>GuMFa&57o<Ur
z87?X!C}6lC4QkAAQ4v7_!v$$jV}^^02nrZ3NP`+PTvS9*z;Hnt)R^I-B7y>j3(}y*
z3>Os<6fj(n1~q25sED9|;es@%F~dbg1O*Hiq(O}tE-E4@V7MR+YJ6K<{jC@NutDDP
ztC83Ft`594O<o1$)X}LNLdy>$bmBRLZr&o->j+gvgl-%|NPZQe9p=kVT|PjxZ;oY$
z^7WrCo!z_jGjUt?nUgacPle)NoZh(M<oTryqkSX%l`Y?W_5R|egWIpXSbO8WAFE#`
zPfu+BWIcLv_o0dT2hXirK6mfny5iNp-dXH>G`i)YhR&|+IkUO=?6;9u2J^q&bNu4;
z<;^dhANh6Qho?{c@u9Z=(6yTrsPD`pD-R@|_+V4``~55LK3~6Z>Z91_i(l{DJG6EA
p#=33SrgvQbd-|WB&6WGmske8<zq$F#VKP}XHZq>Qu>aV}e*p_%<YoW>

literal 0
HcmV?d00001

diff --git a/platform/icons/src/general/searchEverywhereGear@2x.png b/platform/icons/src/general/searchEverywhereGear@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbc8c4eaf04be55ac2aa915fa724e82850a8835c
GIT binary patch
literal 14747
zcmeI3U5pb|6vywP0V!Zq3=(wXFe^c$?acIpwv%be(k^s^U7OvmEHP1Lr?=h7ww-Zi
zO1t%C#b^)%2|~oIChmhVN>HNFgbxEN2@h)Efd_&-@MIJWMnib;E9#wTx4rGQTroV}
zCheTP_kYg0^E>C>otJq%HMC`gYmEy4uwpO~A4XTk{@$|~{hHP4O>|kRC$^gaEL&-R
zd%(=Qs{shDQPX4ASn_F6(Fz_pqm4sPrJy4<0Mf>aE-RDJV#Z-kEk@X1PM&5NH4|aC
z1(JMHkHHBwQ8nO5bttV=CzWu9-57OA6%hp}KucySg?!NzD-qU-D<az-=2*s&Sd$U9
z-%iMkB~wgHGawW21l$TQ_?ckXBLoD0NO+3z@`8`!eVpKP3to{Ai$Z{@f7qxCS(1^-
zio@~E^>pa32s>d}y2x?ma@kY%c{C%(3E^;<<Gq~M>qZK<IaRdeio0m`)q>2&i9=H{
zRNYdwB4fvu$F-6bVOcv-<5Rz{g5F3}H0$gTMXn<2oZ#WPPEHx6;iH#~ytA~7!ofT&
zz@lX$KcS<aKA~BfIiYn)*_iH{7}X@1Y~=2^-a?^cYSS9ni4fG0cJwsUQ##~^p{bP&
z1rF>)x6;???kzRjEKW-#d#3B!VMXoYX3x~zoK~n+NJ952#tbN1nvvGDe6-eOsd<D<
zEXF*(O)X}$viXF>wX2(@ZU%yJ*@98jihj4iyS@Ij;1l_vDEOY_QBU$%keaeBMpDbD
z*{KCF{HT{je@hHZ*&YLJos4YB|0xQt#o}ZXF{>E`*@~(KIR`ntn3K5XAf{|Ilo-?U
znt_%Dqdtl2G>myUO(qT&O-n8+a4;T410Ge)h)On~z^r%N9ms|QZhycZa)*Kn?+*Hd
zKE)ptvc7EAftXC<?h8W4HKk;4lzQmQZHC6&7leMsP|+bL=P`}F`rA#>A<TkQ3Drcc
zIfb<>YFy_S8-Xvjj?PcyRp&U;Wy6H_W{a@%yRC74HI66S$Jw-^tk?%xRI&F0%t&0z
zXmeQ&&$^rXe+yWPkGXfxQJ#RsTWzRXC`Z*jh^b|*vTVTq9O?<eHm?P2^=OYQarT*?
zS6gdP8*MGke6ubrrDPvvB5DJ)B-z0)NZf+4X6BlH%r0lX<miK59(_2${;j*>)9tR?
zZ|#atx4SkyM~kWz_13es4P##Rd0RUXM$n@HjBW@7d;y7TA8z+ZsTG(Xi>qksns!6_
zP$tKxeWIh|_HK^YMBTAgD(s)QQ_0#WdPG1^CtTz4q_xP6J#dGO<{jPPz<4;C1gAl?
zDJ~)+TtIQ*G>A6EMMQ)PC@!1^(WbbFh;RYLh0`F~6c-T@E}*z@8bq7oA|k>C6c<i|
zXj5E7M7V(B!f6m~ii?N{7f@U{4WdnP5fR}6iVLSfv?(qkB3wXm;WUUg#YIGf3n(s}
z2GORth=_0j#f8%#+7uTN5iX#(a2iCL;vyo#1r!%fgJ@G+L`1lN;=*YVZHkMC2p3RX
zI1QpraS;*W0*VW#L9{6@A|hNsap5$GHpN9mgbOGxoCeXRxQK{w0mX&WAlkRY<!Zk0
z2aD(}zcPBA@9fo+v*=YoMoA1O0jRD6VEPpRe*XtuuK`fv0r+VL0OH#KJfyw(!r9G8
z`{!W1KV7+e{ZQoIGyL*beRHYvqoGaJmk)25IMaJ|?YB3E=2qRms;~cG;-lU_`ou5K
zCa)j;V&%ziUOM{L!OK0*E&<H8XzJpr<f7GJrf0V2<}lcLzIXby{1Q;Qd-j9eo{QpV
z4|}GUE((FWriBOo`gs4vV{=zbFtfXFU-a~q?;lL8J+;exL%$C!zrae1jx7V5Z+x}*
z!<G9U1tM5Kyk*0Cq22?)xN>Cg`-jhc_nd2X4@jFm(xJt_O}SQaXGVKt*9NQu&&N;9
zjUG7;*1fa;2XJZE&zJNOJ-Pg`9}~ZB9cMnhz<w@oJ@?4hGy0m#*Ha=l_jm4Q8652a
Y>)E}NyH7C35e6_gFckk}(~e#L0#maJ00000

literal 0
HcmV?d00001

diff --git a/platform/icons/src/general/searchEverywhereGear@2x_dark.png b/platform/icons/src/general/searchEverywhereGear@2x_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3658d816448e254e1111f1c291a46e98d7a9c56
GIT binary patch
literal 14747
zcmeI3U2GIp6vuBZ_)(}@jFk`{CJP#j?9R-7(C)Cid~|`<u+a1)ln?{6Gk4puyEDVg
zl-<?`v7m+o6G~$EHu#ZfVkCs%1NuN?6ra!rl_-g%zL-FaidGV$iQd`W?w;N5a>ej?
zH`$%jd;jO0JHK=8?YzwX?#&yUo0c>ogqpiL<2~fcx!(uxC%^XC*bKQmWOi<|5nAw=
z`)xqSPAo>KeTmjL;0z=-Ns5v2$*PgWzFfv6YJ?)IbEd2eV~0!PK~0Z(e*NTvhtt%k
zXKN@SB+L#xq;-y2xOZ%GpE5SAgjLV#SW_e?kpLO&$XqUy)@>;l_2lD9#CC^y50{rX
z!%@##Hz7BW=;k^M3v(e~$g2oqkZTM3#E=+l7gun8K@9LhfENQ^(Ju*MNepqtk0;hd
ztcaziq@MVOVmk6y)HCEbro{8vY}S_z_zY{17sKH&FZg-C-%Au;dsKJioL9G(7J|&i
ziDO%_G}F-xopa;LNn^x`dOU8T(x-S|8MBl~w~OouMLs8+yyz47T287`@-auObbe{7
z!s9f~VBN8apIFn+95Nik9y02rEKS!<Olp!ylycWxZzfYSwe76mO%N23*7UUdMorB3
zVA~k66uf>nxs|20?%vT-<>FLCa%bwU9p|(<ZthIME#C@-3Ps4hN*xxK9mDD~jC8Ef
zW!<v~xsDEQ`BqI=jja7lgs)bYOI;3x<FbQeq!oi+QSkbMePTco+9WaXtU!8F06_}M
zsu&4F)l#E#VgyMqOTiF~0hHA-$ktJ1NB&PypcceY6)9y{8QF<x8F>)%ral<q%Y#5!
zYAC70NE;Se7LElXe63;Nm2WbsOSc_aS8!K6Mh1MErb;;Fmjhy3*efU1q*n<9Rc}&}
zRj-(APx=F)un-IuASM#feNO1Op^Ug2r5IYh%h14mPUtO`Mh-bS4K(iR?>0q^FmqCM
zYBp)jQP8raar4JmFWyx-Iy;fp^2d=WTQ+t#ThueV+e+tG>3DK|@|#wY755;EDehjt
zYJ{&CEibF&S#;C>ZvhMOfqVTN*&(doX+sr4<yG~A*hb39$`)QbNP2>@%?kl5J*p!|
zc=yatYn3%9j8>K=zvD@>&MjrcJ<24~24qQc9={mj=Zuvz7xV*eInyI~eVbn(A6|5S
zi>`3G+I8EVUEy@KYuU43*PNKYn5}9Uc)90o;Y8>qj|MolG877gB7F65wMVy>!|8#z
zMz*f)He`Tg%KKDL)O6fd&k;-%9Sfxb|HSi^ER2#z1oCvkmmW_li(J|R_t+@k(LD|f
z!?7fg2GwS`sED9|;es@%Hp4|l1O*Hiq(QYAE-E4@V7MR+s?Bgw5kUdN1!+)ihKq^_
z3K%X(gK9HeR76m~a6uYWo8h7&f&zvM(xBQ57Zni{FkFxZ)n>S;h@gPsf;6Z$!$m~|
z1q>IYLA4n!Dk3OgxF8Lx&2Ui>K>@=BX;5v3i;4&e7%oVIYBO9^L{PwRK^jz>;i4jf
z0)`9HpxO)<6%iCLT#yFUX1J(`pn&0mG^jSiMMVS!3>Tz9wHYodA}C<EAPuU0M_f(i
z7yhtL-tx<m*ZFQ<-Li?i3dkv)Jqd)yo<eBPUW9J{L$22m8W9k>u@fQb2trR7hjx6v
zfoT8gim&a<UH$p+rRGnCg|FCqI*xuItowM)w=KucG@hJJY~4NG+Tz<VzI>u*)y&43
z-+X%Vr4LVj*MIHBkKX;};WH9K=YN0s?5)hANi?+(HJ>_s-+=WC3aYEn`%6(M+I#NG
z#1Ce}rbj0m7NY|b)5h!PF3!L8X5&=+$z3zI|9twrHBC1kKe2t^UbORI>yIsy&m-Z`
zBP-XOH2+3Z4eb-s+1sC8KQiy&AF0f;{>+!xdQktoQ^yuepASxc)q5t_a{9*N=lHje
z&v-7+Kb^cZfBE+Zf)7l#roVXg`1o*=3vV3Xv8ZwX8?A3OZ-3#Z&MW)Ao=UxTd9>ly
f>US<Q=9<y66$cXH#Un=v2Gq5FbNuwWo#X!k{BIFB

literal 0
HcmV?d00001

diff --git a/platform/icons/src/general/searchEverywhereGear_dark.png b/platform/icons/src/general/searchEverywhereGear_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5848c477552ae8d030b86a58bbc313fe7949c97
GIT binary patch
literal 14657
zcmeI3U1%It6vuC<N*mj>Abzwj4iiNs?#|49B|GeH8?#9h?4~hIX(FPT%-m$h?9NPQ
zCf!X$EUk!r=u1lN2fkRUU<DD3Ahyy{G!#*!Pboe~@kLt@1s_BN>z$d+?%B<5u9ZIC
zh21&1_kYg0^E>C>%*z}b8Q#66eMdV&Xv@%Gc9dMVdEbo>kl)AuxTBEECTnoQLFmDU
zyl)#i`|e{1_3Y5c#@+GU9$7VuVMQ~iaJXEwh#H~P&a$Pbv)JXP@QiMx`QI*H<~dzU
z^9SNNF=zGRygs;K<9!RmW9q`Jn$-B6nf6p!CIO1rRk(7oU^sF)&HHg>Vtc~^&-oH}
zHqG~X3Aypy2-j!Yn2U$wAyt%OTz4`o#idw}^eh(<rKliA1t}VmBC?p2r8rml@R@dE
zrEG0l9?cF^(viQ?eBN~}SrAI4Qn(ZioA!(#C6h@(j0llPh$uqNyx}V4kl}O&L002r
zv7_3$<?5!vd2y8~bIwikyqBo@soYo5swOg=3OhnkC@YpAg+-y6lcrXEtU0^jFHKVg
zT);(axDN4?n)+FJ(>0yE*&=0ix@BTglU%NvyXkt1#ipqpxBn19P(j+%(;1t$urP`p
zbIw+A{~>ZKoz3pv)u(I4sf*;zv|Kwb>n+^8nZV6&g`h$ya<6iqjTP6l$4s-33A$`#
z6(QHx$31;OH#D>4Jd+X{)wNRB0^zLU;tXlUSV$5>k=U3NmBnsZigt;lCq)n>P&UNK
znVLR5za~bE^s*f5hB1J$F$UQ>n&K+|DGJnrIGQR?n|4ugGkQ^(!GdMXq=ecaP*xjC
z?lTLfO_qf-(Uj0^7<l<jCJz~os~9RC%4WzwSl2Z<nT%kpB@-bvF)f99q?i^;#+5`U
zqGBzM6OkURNAe-&a?pKE=&Y&Ec^jn?TD!~8z<o{Vy|zvcIi&zJ-s<l*MUyaVQVr@3
zY0Y`ivZQhSV{9KjSU<WtQPBP4$Wm+vdz&rIukN<$`BgohJRg74%8Ke8WEs`l3s_4D
zb)&UqRXr<i`u{Cp5Ffa=&QZ!^W4#R(gz{CbgE;22TT*P?J41Scvdx2l^&X9pQ-XKq
z7xelX1f%t(S#8#}rA&E8nM~S%EJ^Y4lg?f<R?8gd$GvhE=6rp3L?j<U@_s9>aJtcT
zVtrRQ-RN5L+;8Y^CQ`}PFburB^ENmU_K`;eoJqvv(RfN|9B%X&(aX3np4G|Lb-ad@
z5*44uiKdPdtsKEb#W5%q_$TgHG8iR~2;}KRs6L+57rD9z?y*t3qk9|}hGR(}4XVv>
zQ4v7_!v$$jZH9}A2nrZ3NP}uKTvS9*z;HntRGZ<VB7y>j3(}z43>Os<6fj(n2GwS`
zsED9|;es@%Hp4|l1O*Hiq(QYAE-E4@V7MR+s?Bgw5kUdN1!+)ihKq^_3K%X(gK9He
zR76m~a6uYWo8h7&f&zvM(xBQ57Zni{FkFxZ)n>S;h@gPsf;6Z$!$m~|1q>IYLA4n!
zDk3OgxF8Lx&2Ui>K>@=BX;5v3i;4&e7%oVIYBO9^L{PwRK^jzhU0m(87yht8-tsGv
z*ZHE~ow-0>1?1Gh(HuexPa<^qC_;bTA=g_7&4~!zo<vAKjnJd!;wxVd5bb+I+1|18
z4_}>lzT>L6IqMu5*mx2P|71H}=(z9Khrc-7|IsJgpXj>z!B3r!e0t`FaQ()n<j=n!
zySjp|bm3dKzTM#N+Pbt$MaM6_91q_-|5n@S&6A6#?myTT63;G=9)0ztD;=L-D7P&x
zUAx%!+SZXD-`SJ@Fm-1WhpxZby<xYWP?leO`_##8-+#7kWx2=Lu0D0Gckk=y+@;(6
imzTeJ<L~2twxOlWxnEAK?0=su77g_eXFq;!^2on5+2|ht

literal 0
HcmV?d00001


From 883d60667af81e2ef32eb19451c13394cd8e9189 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 24 Oct 2014 14:26:50 +0200
Subject: [PATCH 018/132] + SE settings icon (cherry picked from commit
 958ecc3)

---
 platform/util/src/com/intellij/icons/AllIcons.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index cdf7fda9c9c0..43dd68c2c370 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -482,6 +482,7 @@ public class AllIcons {
     public static final Icon Reset = IconLoader.getIcon("/general/reset.png"); // 16x16
     public static final Icon Run = IconLoader.getIcon("/general/run.png"); // 7x10
     public static final Icon RunWithCoverage = IconLoader.getIcon("/general/runWithCoverage.png"); // 16x16
+    public static final Icon SearchEverywhereGear = IconLoader.getIcon("/general/searchEverywhereGear.png"); // 12x12
     public static final Icon SecondaryGroup = IconLoader.getIcon("/general/secondaryGroup.png"); // 16x16
     public static final Icon SeparatorH = IconLoader.getIcon("/general/separatorH.png"); // 17x11
     public static final Icon Settings = IconLoader.getIcon("/general/settings.png"); // 16x16

From dbd9dadac53b8dbb01280c57087c90dee7aae70f Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 24 Oct 2014 14:27:59 +0200
Subject: [PATCH 019/132] SE settings icon style: hamburger -> gear (cherry
 picked from commit 86cab06)

---
 .../src/com/intellij/ide/actions/SearchEverywhereAction.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
index 93a33c6ce5ee..c5a1db15c2e4 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
@@ -716,7 +716,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
     topPanel.add(title, BorderLayout.WEST);
     final JPanel controls = new JPanel(new BorderLayout());
     controls.setOpaque(false);
-    final JLabel settings = new JLabel(AllIcons.General.WebSettings);
+    final JLabel settings = new JLabel(AllIcons.General.SearchEverywhereGear);
     new ClickListener(){
       @Override
       public boolean onClick(@NotNull MouseEvent event, int clickCount) {

From c6ba77b7029d6df5604c7a85eeb408af5ffe0dc7 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 24 Oct 2014 16:16:35 +0200
Subject: [PATCH 020/132] introduce new static method isEnabled (cherry picked
 from commit 4d32ab9)

---
 .../impl/welcomeScreen/FlatWelcomeFrameProvider.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrameProvider.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrameProvider.java
index 0679762b3f46..6bf6c07a4e2b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrameProvider.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrameProvider.java
@@ -26,10 +26,11 @@ import com.intellij.util.PlatformUtils;
 public class FlatWelcomeFrameProvider implements WelcomeFrameProvider {
   @Override
   public IdeFrame createFrame() {
-    if (Registry.is("ide.new.welcome.screen") 
-        && (PlatformUtils.isIntelliJ() || PlatformUtils.isCidr())) {
-      return new FlatWelcomeFrame();
-    }
-    return null;
+    return isAvailable() ? new FlatWelcomeFrame() : null;
+  }
+
+  public static boolean isAvailable() {
+    return Registry.is("ide.new.welcome.screen")
+            && (PlatformUtils.isIntelliJ() || PlatformUtils.isCidr());
   }
 }

From e3c397416ad34977e32152c36d8a5ecba6d06870 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 24 Oct 2014 16:17:39 +0200
Subject: [PATCH 021/132] add "Check for Update" action to the new welcome
 screen (cherry picked from commit f3aaf92)

---
 .../updateSettings/impl/CheckForUpdateAction.java      | 10 ++++++++--
 .../wm/impl/welcomeScreen/FlatWelcomeFrame.java        |  3 +--
 .../platform-resources/src/idea/PlatformActions.xml    |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java
index 81b51cab9cb2..bfa477159ef1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,17 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.wm.impl.welcomeScreen.FlatWelcomeFrameProvider;
 
 public class CheckForUpdateAction extends AnAction implements DumbAware {
   @Override
   public void update(AnActionEvent e) {
-    e.getPresentation().setVisible(!SystemInfo.isMacSystemMenu || !ActionPlaces.MAIN_MENU.equals(e.getPlace()));
+    final String place = e.getPlace();
+    if (ActionPlaces.WELCOME_SCREEN.equals(place) && FlatWelcomeFrameProvider.isAvailable()) {
+      e.getPresentation().setEnabledAndVisible(true);
+    } else {
+      e.getPresentation().setVisible(!SystemInfo.isMacSystemMenu || !ActionPlaces.MAIN_MENU.equals(place));
+    }
   }
 
   @Override
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
index 564206931b40..076a161d26f0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
@@ -294,8 +294,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame {
         public void actionPerformed(@NotNull AnActionEvent e) {
           ActionGroup configureGroup = (ActionGroup)ActionManager.getInstance().getAction(groupId);
           final PopupFactoryImpl.ActionGroupPopup popup = (PopupFactoryImpl.ActionGroupPopup)JBPopupFactory.getInstance()
-            .createActionGroupPopup(null, new IconsFreeActionGroup(configureGroup), e.getDataContext(), false, false, false, null,
-                                    10, null);
+            .createActionGroupPopup(null, new IconsFreeActionGroup(configureGroup), e.getDataContext(), JBPopupFactory.ActionSelectionAid.SPEEDSEARCH, false, ActionPlaces.WELCOME_SCREEN);
           popup.showUnderneathOfLabel(ref.get());
         }
       };
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index 26448ea7337f..f989604a8c65 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -533,6 +533,7 @@
 
       <action id="WelcomeScreen.Configure.DesktopEntry" class="com.intellij.ide.actions.CreateDesktopEntryAction"
               icon="AllIcons.Welcome.CreateDesktopEntry"/>
+      <action id="WelcomeScreen.Update" class="com.intellij.openapi.updateSettings.impl.CheckForUpdateAction" text="Check for Update"/>
     </group>
 
     <group id="FileChooser">

From b3e9b2b9f20856007d664f90a535af1b5388ff03 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 24 Oct 2014 17:30:43 +0200
Subject: [PATCH 022/132] WelcomeScreen respect "isPopup" for ActionGroups
 (cherry picked from commit a60f53b)

---
 .../openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
index 076a161d26f0..5760c32c67b6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
@@ -508,9 +508,15 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame {
       private final ActionGroup myGroup;
 
       public IconsFreeActionGroup(ActionGroup group) {
+        super(group.getTemplatePresentation().getText(), group.getTemplatePresentation().getDescription(), null);
         myGroup = group;
       }
 
+      @Override
+      public boolean isPopup() {
+        return myGroup.isPopup();
+      }
+
       @NotNull
       @Override
       public AnAction[] getChildren(@Nullable AnActionEvent e) {

From 41a5a1f90f510a4c938a57413648a58000373222 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 24 Oct 2014 17:53:22 +0200
Subject: [PATCH 023/132] TemplateProjectStructureAction shows Project
 structure dialog with gaps (cherry picked from commit d933e31)

---
 .../ide/actions/TemplateProjectStructureAction.java | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java b/java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java
index ed439c6c2b70..2b38f1a281f6 100644
--- a/java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java
+++ b/java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,5 @@
  */
 package com.intellij.ide.actions;
 
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.project.ex.ProjectManagerEx;
-
-public class TemplateProjectStructureAction extends AnAction implements DumbAware {
-  @Override
-  public void actionPerformed(final AnActionEvent e) {
-    ShowStructureSettingsAction.showDialog(ProjectManagerEx.getInstanceEx().getDefaultProject());
-  }
+public class TemplateProjectStructureAction extends ShowStructureSettingsAction {
 }
\ No newline at end of file

From fac6c2f86ca4cd0ad54d74e628153866444d9ac2 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 24 Oct 2014 17:57:15 +0200
Subject: [PATCH 024/132] move right actions panel for 10px (cherry picked from
 commit 88b7198)

---
 .../intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
index 5760c32c67b6..b93a024a1660 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
@@ -311,6 +311,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame {
 
     private JComponent createActionPanel() {
       JPanel actions = new NonOpaquePanel();
+      actions.setBorder(new EmptyBorder(0, 10, 0, 0));
       actions.setLayout(new BoxLayout(actions, BoxLayout.Y_AXIS));
       ActionManager actionManager = ActionManager.getInstance();
       ActionGroup quickStart = (ActionGroup)actionManager.getAction(IdeActions.GROUP_WELCOME_SCREEN_QUICKSTART);

From b9dea53bfe3576d328844c864914173466c1aa38 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 24 Oct 2014 18:10:59 +0200
Subject: [PATCH 025/132] fix spacing between project name and path on welcome
 screen (cherry picked from commit 7d24e36)

---
 .../wm/impl/welcomeScreen/NewRecentProjectPanel.java     | 9 +++++++++
 .../wm/impl/welcomeScreen/RecentProjectPanel.java        | 9 +++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewRecentProjectPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewRecentProjectPanel.java
index 0d7fccb29982..fb1fc55c32ae 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewRecentProjectPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewRecentProjectPanel.java
@@ -94,6 +94,15 @@ public class NewRecentProjectPanel extends RecentProjectPanel {
       protected Color getListForeground(boolean isSelected, boolean hasFocus) {
         return UIUtil.getListForeground(isSelected && hasFocus);
       }
+
+      @Override
+      protected void layoutComponents() {
+        setLayout(new BorderLayout());
+        myName.setBorder(new EmptyBorder(6, 5, 1, 5));
+        myPath.setBorder(new EmptyBorder(1, 5, 6, 5));
+        add(myName, BorderLayout.NORTH);
+        add(myPath, BorderLayout.SOUTH);
+      }
     };
   }
   
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java
index f47c53330771..df299567505b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java
@@ -28,6 +28,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CustomShortcutSet;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.VerticalFlowLayout;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.io.UniqueNameBuilder;
 import com.intellij.openapi.util.text.StringUtil;
@@ -239,12 +240,16 @@ public class RecentProjectPanel extends JPanel {
     protected RecentProjectItemRenderer(UniqueNameBuilder<ReopenProjectAction> pathShortener) {
       super(new VerticalFlowLayout());
       myShortener = pathShortener;
+      myPath.setFont(myPath.getFont().deriveFont(SystemInfo.isMac ? 10f : 11f));
       setFocusable(true);
-      myPath.setFont(myPath.getFont().deriveFont((float)10));
+      layoutComponents();
+    }
+
+    protected void layoutComponents() {
       add(myName);
       add(myPath);
     }
-    
+
     protected Color getListBackground(boolean isSelected, boolean hasFocus) {
       return UIUtil.getListBackground(isSelected);
     }

From a9bb3f412278a560428ffd2e8c8d7ed26c4d2f83 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 24 Oct 2014 10:36:19 +0200
Subject: [PATCH 026/132] make test more predictable

---
 .../plugins/javaFX/fxml/JavaFXQuickfixTest.java        |  9 ++++++++-
 .../intentions/JavaFxInjectPageLanguageIntention.java  | 10 +++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java
index b95b12497e7b..a99c0e4da48e 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java
@@ -20,12 +20,16 @@ import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.ContentEntry;
 import com.intellij.openapi.roots.ModifiableRootModel;
+import com.intellij.psi.xml.XmlFile;
 import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.testFramework.PsiTestUtil;
 import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.javaFX.fxml.codeInsight.inspections.JavaFxUnresolvedFxIdReferenceInspection;
+import org.jetbrains.plugins.javaFX.fxml.codeInsight.intentions.JavaFxInjectPageLanguageIntention;
+
+import java.util.Set;
 
 public class JavaFXQuickfixTest extends LightCodeInsightFixtureTestCase {
   public static final DefaultLightProjectDescriptor JAVA_FX_WITH_GROOVY_DESCRIPTOR = new DefaultLightProjectDescriptor() {
@@ -66,7 +70,10 @@ public class JavaFXQuickfixTest extends LightCodeInsightFixtureTestCase {
     myFixture.configureByFile(getTestName(true) + ".fxml");
     final IntentionAction intention = myFixture.findSingleIntention("Specify page language");
     assertNotNull(intention);
-    myFixture.launchAction(intention);
+    Set<String> languages = JavaFxInjectPageLanguageIntention.getAvailableLanguages();
+    assertContainsElements(languages, "groovy");
+    JavaFxInjectPageLanguageIntention languageIntention = (JavaFxInjectPageLanguageIntention)intention;
+    languageIntention.registerPageLanguage(getProject(), (XmlFile)myFixture.getFile(), "groovy");
     myFixture.checkResultByFile(getTestName(true) + ".fxml", getTestName(true) + "_after.fxml", true);
   }
 
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxInjectPageLanguageIntention.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxInjectPageLanguageIntention.java
index 0cbd61f765a9..dc62783d23fb 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxInjectPageLanguageIntention.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxInjectPageLanguageIntention.java
@@ -52,7 +52,7 @@ import java.util.TreeSet;
 public class JavaFxInjectPageLanguageIntention extends PsiElementBaseIntentionAction {
   public static final Logger LOG = Logger.getInstance("#" + JavaFxInjectPageLanguageIntention.class.getName());
 
-  private static Set<String> getAvailableLanguages(Project project) {
+  public static Set<String> getAvailableLanguages() {
     final List<ScriptEngineFactory> engineFactories = new ScriptEngineManager().getEngineFactories();
 
     final Set<String> availableNames = new TreeSet<String>();
@@ -68,8 +68,8 @@ public class JavaFxInjectPageLanguageIntention extends PsiElementBaseIntentionAc
     if (!FileModificationService.getInstance().preparePsiElementsForWrite(element)) return;
     final XmlFile containingFile = (XmlFile)element.getContainingFile();
 
-    final Set<String> availableLanguages = getAvailableLanguages(project);
-    if (availableLanguages.size() == 1 || ApplicationManager.getApplication().isUnitTestMode()) {
+    final Set<String> availableLanguages = getAvailableLanguages();
+    if (availableLanguages.size() == 1) {
       registerPageLanguage(project, containingFile, availableLanguages.iterator().next());
     } else {
       final JBList list = new JBList(availableLanguages);
@@ -83,7 +83,7 @@ public class JavaFxInjectPageLanguageIntention extends PsiElementBaseIntentionAc
     }
   }
 
-  private void registerPageLanguage(final Project project, final XmlFile containingFile, final String languageName) {
+  public void registerPageLanguage(final Project project, final XmlFile containingFile, final String languageName) {
     new WriteCommandAction.Simple(project, getFamilyName()) {
       @Override
       protected void run() {
@@ -110,7 +110,7 @@ public class JavaFxInjectPageLanguageIntention extends PsiElementBaseIntentionAc
 
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
-    if (ContainerUtil.isEmpty(getAvailableLanguages(project))) {
+    if (ContainerUtil.isEmpty(getAvailableLanguages())) {
       return false;
     }
     setText(getFamilyName());

From 5136167d8bc84323751d04313b1c2130cbf90e45 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 24 Oct 2014 17:21:37 +0200
Subject: [PATCH 027/132] new inference: use site substitution inside one level
 of inference only so calls with different site substitutions are possible in
 one expression (IDEA-131723; IDEA-131562)

---
 .../src/com/intellij/psi/GenericsUtil.java    | 70 +++++++++++--------
 .../graphInference/InferenceSession.java      | 29 ++++++--
 .../ExpressionCompatibilityConstraint.java    | 14 ++--
 ...teSubstitutionInExpressionConstraints.java | 49 +++++++++++++
 .../lambda/methodRef/ReturnTypeSpecific.java  |  4 +-
 .../GraphInferenceHighlightingTest.java       |  4 ++
 6 files changed, 125 insertions(+), 45 deletions(-)
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/SiteSubstitutionInExpressionConstraints.java

diff --git a/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java b/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
index 0818ea4e41a0..c49580e97c85 100644
--- a/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
@@ -255,41 +255,55 @@ public class GenericsUtil {
                                                                                 final PsiSubstitutor substitutor,
                                                                                 final PsiElement context,
                                                                                 final boolean allowUncheckedConversion) {
-    nextTypeParam:
     for (PsiTypeParameter typeParameter : typeParams) {
-      PsiType substituted = substitutor.substitute(typeParameter);
-      if (substituted == null) return null;
-      if (context != null) {
-        substituted = PsiUtil.captureToplevelWildcards(substituted, context);
+      PsiType boundError = findTypeParameterBoundError(typeParameter, typeParameter.getExtendsListTypes(),
+                                                       substitutor, context, allowUncheckedConversion);
+      if (boundError != null) {
+        return Pair.create(typeParameter, boundError);
       }
+    }
+    return null;
+  }
 
-      PsiClassType[] extendsTypes = typeParameter.getExtendsListTypes();
-      for (PsiClassType type : extendsTypes) {
-        PsiType extendsType = substitutor.substitute(type);
-        if (substituted instanceof PsiWildcardType) {
-          if (((PsiWildcardType)substituted).isSuper()) {
-            continue;
-          }
-          final PsiType extendsBound = ((PsiWildcardType)substituted).getExtendsBound();
-          if (acceptExtendsBound(extendsType, extendsBound)) {
-            continue nextTypeParam;
-          }
+  public static PsiType findTypeParameterBoundError(PsiTypeParameter typeParameter,
+                                                    PsiType[] extendsTypes,
+                                                    PsiSubstitutor substitutor,
+                                                    PsiElement context,
+                                                    boolean allowUncheckedConversion) {
+    PsiType substituted = substitutor.substitute(typeParameter);
+    if (substituted == null) return null;
+    if (context != null) {
+      substituted = PsiUtil.captureToplevelWildcards(substituted, context);
+    }
+
+    if (substituted instanceof PsiWildcardType) {
+      if (((PsiWildcardType)substituted).isSuper()) {
+        return null;
+      }
+    }
+
+    for (PsiType type : extendsTypes) {
+      PsiType extendsType = substitutor.substitute(type);
+      if (substituted instanceof PsiWildcardType) {
+        final PsiType extendsBound = ((PsiWildcardType)substituted).getExtendsBound();
+        if (acceptExtendsBound(extendsType, extendsBound)) {
+          return null;
         }
-        else if (substituted instanceof PsiIntersectionType) {
-          for (PsiType extendsBound : ((PsiIntersectionType)substituted).getConjuncts()) {
-            if (acceptExtendsBound(extendsType, extendsBound)) continue nextTypeParam;
-          }
+      }
+      else if (substituted instanceof PsiIntersectionType) {
+        for (PsiType extendsBound : ((PsiIntersectionType)substituted).getConjuncts()) {
+          if (acceptExtendsBound(extendsType, extendsBound)) return null;
         }
-        else if (substituted instanceof PsiCapturedWildcardType) {
-          final PsiType extendsBound = ((PsiCapturedWildcardType)substituted).getUpperBound();
-          if (acceptExtendsBound(extendsType, extendsBound)) {
-            continue nextTypeParam;
-          }
-        }
-        if (extendsType != null && !TypeConversionUtil.isAssignable(extendsType, substituted, allowUncheckedConversion)) {
-          return Pair.create(typeParameter, extendsType);
+      }
+      else if (substituted instanceof PsiCapturedWildcardType) {
+        final PsiType extendsBound = ((PsiCapturedWildcardType)substituted).getUpperBound();
+        if (acceptExtendsBound(extendsType, extendsBound)) {
+          return null;
         }
       }
+      if (extendsType != null && !TypeConversionUtil.isAssignable(extendsType, substituted, allowUncheckedConversion)) {
+        return extendsType;
+      }
     }
     return null;
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
index 51350e124dd3..22beb02e68b8 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
@@ -254,12 +254,12 @@ public class InferenceSession {
       }
     }
 
-    final PsiSubstitutor substitutor = resolveBounds(myInferenceVariables, mySiteSubstitutor);
+    final PsiSubstitutor substitutor = resolveBounds(myInferenceVariables, PsiSubstitutor.EMPTY);
     if (substitutor != null) {
       if (myContext != null) {
         myContext.putUserData(ERASED, myErased);
       }
-      mySiteSubstitutor = substitutor;
+      mySiteSubstitutor = mySiteSubstitutor.putAll(substitutor);
       for (InferenceVariable variable : myInferenceVariables) {
         variable.setInstantiation(substitutor.substitute(variable.getParameter()));
       }
@@ -403,7 +403,7 @@ public class InferenceSession {
   }
 
   public PsiSubstitutor retrieveNonPrimitiveEqualsBounds(Collection<InferenceVariable> variables) {
-    PsiSubstitutor substitutor = mySiteSubstitutor;
+    PsiSubstitutor substitutor = PsiSubstitutor.EMPTY;
     for (InferenceVariable variable : variables) {
       final PsiType equalsBound = getEqualsBound(variable, substitutor);
       if (!(equalsBound instanceof PsiPrimitiveType)) {
@@ -751,6 +751,22 @@ public class InferenceSession {
     return isProperType(bound) ? bound : substitutor.substitute(bound);
   }
 
+  private static boolean hasBoundProblems(final List<InferenceVariable> typeParams,
+                                          final PsiSubstitutor substitutor,
+                                          final PsiElement context) {
+    for (InferenceVariable typeParameter : typeParams) {
+      if (typeParameter.getCallContext() != context) {
+        continue;
+      }
+      final List<PsiType> extendsTypes = typeParameter.getBounds(InferenceBound.UPPER);
+      final PsiType[] bounds = extendsTypes.toArray(new PsiType[extendsTypes.size()]);
+      if (GenericsUtil.findTypeParameterBoundError(typeParameter, bounds, substitutor, context, true) != null) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   private PsiSubstitutor resolveBounds(final Collection<InferenceVariable> inferenceVariables,
                                        PsiSubstitutor substitutor) {
     final Collection<InferenceVariable> allVars = new ArrayList<InferenceVariable>(inferenceVariables);
@@ -759,8 +775,7 @@ public class InferenceSession {
       if (!myIncorporationPhase.hasCaptureConstraints(vars)) {
         PsiSubstitutor firstSubstitutor = resolveSubset(vars, substitutor);
         if (firstSubstitutor != null) {
-          final Set<PsiTypeParameter> parameters = firstSubstitutor.getSubstitutionMap().keySet();
-          if (GenericsUtil.findTypeParameterWithBoundError(parameters.toArray(new PsiTypeParameter[parameters.size()]), firstSubstitutor, myContext, true) != null) {
+          if (hasBoundProblems(vars, firstSubstitutor, myContext)) {
             firstSubstitutor = null;
           }
         }
@@ -837,7 +852,7 @@ public class InferenceSession {
     for (InferenceVariable var : vars) {
       LOG.assertTrue(var.getInstantiation() == PsiType.NULL);
       final PsiTypeParameter typeParameter = var.getParameter();
-      if (substitutor.getSubstitutionMap().containsKey(typeParameter) && var.getCallContext() != myContext) {
+      if (substitutor.putAll(mySiteSubstitutor).getSubstitutionMap().containsKey(typeParameter) && var.getCallContext() != myContext) {
         continue;//todo
       }
 
@@ -849,7 +864,7 @@ public class InferenceSession {
           type =  PsiType.getJavaLangRuntimeException(myManager, GlobalSearchScope.allScope(myManager.getProject()));
         }
         else {
-          if (substitutor.getSubstitutionMap().get(typeParameter) != null) continue;
+          if (substitutor.putAll(mySiteSubstitutor).getSubstitutionMap().get(typeParameter) != null) continue;
           type = myErased ? null : getUpperBound(var, substitutor);
         }
       }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java
index b59cf70bdb69..f7b73ba5eee2 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java
@@ -90,13 +90,9 @@ public class ExpressionCompatibilityConstraint extends InputOutputConstraintForm
         if (method != null && !method.isConstructor()) {
           returnType = method.getReturnType();
           if (returnType != null) {
-            List<PsiTypeParameter> params = new ArrayList<PsiTypeParameter>();
-            for (PsiTypeParameter parameter : PsiUtil.typeParametersIterable(method)) {
-              params.add(parameter);
-            }
-            typeParams = params.toArray(new PsiTypeParameter[params.size()]);
+            typeParams = method.getTypeParameters();
           }
-        } else if (myExpression instanceof PsiNewExpression) {  //default constructor
+        } else if (myExpression instanceof PsiNewExpression) {
           final PsiJavaCodeReferenceElement classReference = ((PsiNewExpression)myExpression).getClassOrAnonymousClassReference();
           if (classReference != null) {
             final PsiElement psiClass = classReference.resolve();
@@ -108,7 +104,9 @@ public class ExpressionCompatibilityConstraint extends InputOutputConstraintForm
         }
 
         if (typeParams != null) {
-          final InferenceSession callSession = new InferenceSession(typeParams, PsiSubstitutor.EMPTY, myExpression.getManager(), myExpression);
+          PsiSubstitutor siteSubstitutor =
+            resolveResult instanceof MethodCandidateInfo && method != null && !method.isConstructor() ? ((MethodCandidateInfo)resolveResult).getSiteSubstitutor() : PsiSubstitutor.EMPTY;
+          final InferenceSession callSession = new InferenceSession(typeParams, siteSubstitutor, myExpression.getManager(), myExpression);
           callSession.propagateVariables(session.getInferenceVariables());
           if (method != null) {
             final PsiExpression[] args = argumentList.getExpressions();
@@ -120,7 +118,7 @@ public class ExpressionCompatibilityConstraint extends InputOutputConstraintForm
           if (!accepted) {
             return false;
           }
-          callSession.registerReturnTypeConstraints(returnType, myT);
+          callSession.registerReturnTypeConstraints(siteSubstitutor.substitute(returnType), myT);
           if (callSession.repeatInferencePhases(true)) {
             session.registerNestedSession(callSession);
           } else {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/SiteSubstitutionInExpressionConstraints.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/SiteSubstitutionInExpressionConstraints.java
new file mode 100644
index 000000000000..927dc965042d
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/SiteSubstitutionInExpressionConstraints.java
@@ -0,0 +1,49 @@
+import java.util.Map;
+import java.util.List;
+
+//expected type parameter
+class Sample<V> {
+
+  public <K> Map<V,  K> test() {
+    return null;
+  }
+
+  public <T> void fun(T t, V v) {
+  }
+
+  <M> M bar() {
+    return null;
+  }
+
+  void run(Sample<Integer> sample) {
+    fun(test(), bar());
+    sample.fun(test(), sample.bar());
+    sample.fun(test(), bar());
+    fun(test(), sample.bar());
+
+    fun(sample.test(), bar());
+    fun(sample.test(), sample.bar());
+    sample.fun(sample.test(), bar());
+    sample.fun(sample.test(), sample.bar());
+  }
+}
+
+//expected generic type
+class Sample1<T> {
+  public <S extends T> List<S> reverse() {
+    return null;
+  }
+
+  public void foo(Sample1<Comparable> t)
+  {
+    newTreeSet(t.reverse());
+    newTreeSet(reverse());
+
+    t.newTreeSet(t.reverse());
+    t.newTreeSet(reverse());
+  }
+
+
+  public <E> void newTreeSet(List<E> comparator) {}
+}
+
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/ReturnTypeSpecific.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/ReturnTypeSpecific.java
index 0696aadf6179..6b4de4e565a8 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/ReturnTypeSpecific.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/ReturnTypeSpecific.java
@@ -67,7 +67,7 @@ class MyTest1 {
     }
 
     public static void main(String[] args) {
-        m<error descr="Ambiguous method call: both 'MyTest1.m(I1)' and 'MyTest1.m(I2)' match">(Foo::new)</error>;
+        m<error descr="Ambiguous method call: both 'MyTest1.m(I2)' and 'MyTest1.m(I3)' match">(Foo::new)</error>;
     }
 }
 class MyTest2 {
@@ -104,6 +104,6 @@ class MyTest2 {
     }
 
     public static void main(String[] args) {
-        m<error descr="Ambiguous method call: both 'MyTest2.m(I1)' and 'MyTest2.m(I2)' match">(Foo::new)</error>;
+        m<error descr="Ambiguous method call: both 'MyTest2.m(I2)' and 'MyTest2.m(I3)' match">(Foo::new)</error>;
     }
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
index 538b833b5e3b..122e776fda9d 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
@@ -172,6 +172,10 @@ public class GraphInferenceHighlightingTest extends LightDaemonAnalyzerTestCase
     doTest();
   }
 
+  public void testSiteSubstitutionInExpressionConstraints() throws Exception {
+    doTest();
+  }
+
   public void testIncorporationWithEqualsBoundsSubstitution() throws Exception {
     doTest();
   }

From 04d5460d0342725990d1903afbbfce0ac5669003 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 24 Oct 2014 17:42:58 +0200
Subject: [PATCH 028/132] inspections ui: avoid NPE when non-existing scope is
 used

---
 .../src/com/intellij/codeInspection/ex/Descriptor.java    | 7 +++++++
 .../com/intellij/codeInspection/ex/VisibleTreeState.java  | 8 +++-----
 .../codeInspection/ui/SingleInspectionProfilePanel.java   | 5 ++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java
index b27befd36b00..322a273830e5 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java
@@ -45,6 +45,7 @@ public class Descriptor {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.ex.Descriptor");
   private final ScopeToolState myState;
   private final InspectionProfileImpl myInspectionProfile;
+  private final String myScopeName;
 
   public Descriptor(@NotNull ScopeToolState state, @NotNull InspectionProfileImpl inspectionProfile, @NotNull Project project) {
     myState = state;
@@ -54,6 +55,7 @@ public class Descriptor {
     final String[] groupPath = tool.getGroupPath();
     myGroup = groupPath.length == 0 ? new String[]{InspectionProfileEntry.GENERAL_GROUP_NAME} : groupPath;
     myKey = HighlightDisplayKey.find(tool.getShortName());
+    myScopeName = state.getScopeName();
     myScope = state.getScope(project);
     myLevel = inspectionProfile.getErrorLevel(myKey, myScope, project);
     myEnabled = inspectionProfile.isToolEnabled(myKey, myScope, project);
@@ -137,6 +139,11 @@ public class Descriptor {
     return myGroup;
   }
 
+  @NotNull
+  public String getScopeName() {
+    return myScopeName;
+  }
+
   @Nullable
   public NamedScope getScope() {
     return myScope;
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/VisibleTreeState.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/VisibleTreeState.java
index d81fbf692812..1dc2f40f5432 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/VisibleTreeState.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/VisibleTreeState.java
@@ -176,11 +176,9 @@ public class VisibleTreeState{
       final State other = (State)o;
       if (myKey.equals(other.myKey)) {
         if (myDescriptor != null && other.myDescriptor != null) {
-          final NamedScope scope1 = myDescriptor.getScope();
-          final NamedScope scope2 = other.myDescriptor.getScope();
-          if (scope1 != null && scope2 != null) {
-            return scope1.getName().compareTo(scope2.getName());
-          }
+          final String scope1 = myDescriptor.getScopeName();
+          final String scope2 = other.myDescriptor.getScopeName();
+          return scope1.compareTo(scope2);
         }
       }
       return myKey.compareTo(other.myKey);
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
index 28118dd382d9..5c5f8c745c73 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
@@ -241,9 +241,8 @@ public class SingleInspectionProfilePanel extends JPanel {
     } else {
       for (ScopeToolState candidate : mySelectedProfile
         .getNonDefaultTools(descriptor.getKey().toString(), myProjectProfileManager.getProject())) {
-        final NamedScope scope = descriptor.getScope();
-        LOG.assertTrue(scope != null);
-        if (Comparing.equal(candidate.getScopeName(), scope.getName())) {
+        final String scope = descriptor.getScopeName();
+        if (Comparing.equal(candidate.getScopeName(), scope)) {
           state = candidate;
           break;
         }

From a56e52d8689fe3fb807debacd5e33f8c7836f010 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 24 Oct 2014 18:20:24 +0200
Subject: [PATCH 029/132] put new variable inside lambda body: check
 lambda-related types only after lambda body is fixed (EA-62133 - IOE:
 PsiJavaParserFacadeImpl.createStatementFromText)

---
 .../refactoring/util/RefactoringUtil.java     | 24 +++++++++----------
 .../PutInLambdaBody.after.java                | 20 ++++++++++++++++
 .../introduceVariable/PutInLambdaBody.java    | 17 +++++++++++++
 .../refactoring/IntroduceVariableTest.java    |  4 ++++
 4 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.after.java
 create mode 100644 java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.java

diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
index a411917b5255..004599135fee 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
@@ -880,22 +880,22 @@ public class RefactoringUtil {
       LOG.assertTrue(newBody != null);
       newBody.add(declaration);
 
-      final PsiStatement lastBodyStatement;
-      if (LambdaUtil.getFunctionalInterfaceReturnType(lambdaExpression) == PsiType.VOID) {
-        lastBodyStatement = elementFactory.createStatementFromText("a;", lambdaExpression);
-        ((PsiExpressionStatement)lastBodyStatement).getExpression().replace(lambdaExpressionBody);
-      }
-      else {
-        lastBodyStatement = elementFactory.createStatementFromText("return a;", lambdaExpression);
-        final PsiExpression returnValue = ((PsiReturnStatement)lastBodyStatement).getReturnValue();
-        LOG.assertTrue(returnValue != null);
-        returnValue.replace(lambdaExpressionBody);
-      }
+      PsiStatement lastBodyStatement = elementFactory.createStatementFromText("a;", lambdaExpression);
+      ((PsiExpressionStatement)lastBodyStatement).getExpression().replace(lambdaExpressionBody);
       newBody.add(lastBodyStatement);
 
-      final PsiLambdaExpression copy = (PsiLambdaExpression)lambdaExpression.replace(expressionFromText);
+      PsiLambdaExpression copy = (PsiLambdaExpression)lambdaExpression.replace(expressionFromText);
       newBody = (PsiCodeBlock)copy.getBody();
       LOG.assertTrue(newBody != null);
+
+      if (LambdaUtil.getFunctionalInterfaceReturnType(copy) != PsiType.VOID) {
+        PsiExpressionStatement lastStatement = (PsiExpressionStatement)newBody.getStatements()[1];
+        PsiReturnStatement returnStatement = (PsiReturnStatement)elementFactory.createStatementFromText("return a;", copy);
+        final PsiExpression returnValue = returnStatement.getReturnValue();
+        LOG.assertTrue(returnValue != null);
+        returnValue.replace(lastStatement.getExpression());
+        lastStatement.replace(returnStatement);
+      }
       declaration = newBody.getStatements()[0];
       declaration = (PsiStatement)JavaCodeStyleManager.getInstance(declaration.getProject()).shortenClassReferences(declaration);
     }
diff --git a/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.after.java b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.after.java
new file mode 100644
index 000000000000..afdfb96db8e2
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.after.java
@@ -0,0 +1,20 @@
+class Foo {
+    interface I<T> {
+        T m(Object op);
+    }
+
+    interface J<T> {
+        int m(T o);
+    }
+
+
+    void f(J r) {}
+    void f(I<String> r) {}
+
+    {
+        f((Object a) -> {
+            int c = 1;
+            return c;
+        });
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.java b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.java
new file mode 100644
index 000000000000..3d54e3b88646
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.java
@@ -0,0 +1,17 @@
+class Foo {
+    interface I<T> {
+        T m(Object op);
+    }
+
+    interface J<T> {
+        int m(T o);
+    }
+
+
+    void f(J r) {}
+    void f(I<String> r) {}
+
+    {
+        f((Object a) -> <selection>1</selection>);
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
index 4e993aac90aa..29f792330bbf 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
@@ -437,6 +437,10 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase {
     doTest(new MockIntroduceVariableHandler("c", false, false, false, "int"));
   }
 
+  public void testPutInLambdaBody() {
+    doTest(new MockIntroduceVariableHandler("c", false, false, false, "int"));
+  }
+
   public void testNormalizeDeclarations() {
     doTest(new MockIntroduceVariableHandler("i3", false, false, false, "int"));
   }

From d47dabbb0b6d8fe52ac1d967aba7991d8e3e745f Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 24 Oct 2014 18:31:01 +0200
Subject: [PATCH 030/132] constant & conditions: do not try to annotate lambda
 as @Nullable (IDEA-131865)

---
 .../codeInspection/dataFlow/DataFlowInspectionBase.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
index 6572fd309b78..d9358980c78f 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
@@ -470,7 +470,7 @@ public class DataFlowInspectionBase extends BaseJavaBatchLocalInspectionTool {
                             ? InspectionsBundle.message("dataflow.message.return.null.from.notnullable", presentableNullable)
                             : InspectionsBundle.message("dataflow.message.return.nullable.from.notnullable", presentableNullable);
         final LocalQuickFix[] fixes =
-          PsiTreeUtil.skipParentsOfType(expr, PsiCodeBlock.class, PsiReturnStatement.class) instanceof PsiLambdaExpression
+          PsiTreeUtil.getParentOfType(expr, PsiMethod.class, PsiLambdaExpression.class) instanceof PsiLambdaExpression
           ? LocalQuickFix.EMPTY_ARRAY
           : new LocalQuickFix[]{ new AnnotateMethodFix(defaultNullable, ArrayUtil.toStringArray(manager.getNotNulls())) {
             @Override

From eeb0e9c796d6ca1ea0b6128e61c643acd1da2d0a Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Fri, 24 Oct 2014 20:41:22 +0400
Subject: [PATCH 031/132] push dialog: do not repaint tree path when loading
 icon is not visible.

---
 .../dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java     | 1 +
 .../dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java
index 0105032eba97..b983e8f46024 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java
@@ -69,6 +69,7 @@ class LoadingIcon extends JBImageIcon {
     }
 
     public boolean imageUpdate(Image img, int flags, int x, int y, int w, int h) {
+      if (myNode instanceof RepositoryNode && !((RepositoryNode)myNode).isLoading()) return false;
       if ((flags & (FRAMEBITS | ALLBITS)) != 0) {
         TreeNode[] pathToRoot = myModel.getPathToRoot(myNode);
         if (pathToRoot != null) {
diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java
index 12236ed4aefe..6a31c1a123b7 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java
@@ -155,6 +155,7 @@ public class RepositoryNode extends CheckedTreeNode implements EditableTreeNode,
 
   public void stopLoading() {
     myLoading.set(false);
+    myLoadingIcon.setImageObserver(null);
   }
 
   public boolean isLoading() {

From 65ec268a0cdb295e0184521f9e8cc69be58eeca7 Mon Sep 17 00:00:00 2001
From: "liana.bakradze" <liana.bakradze@jetbrains.com>
Date: Fri, 24 Oct 2014 21:17:03 +0400
Subject: [PATCH 032/132] EDU-235 Create sample lesson and task in course

---
 .../coursecreator/CCProjectGenerator.java     |  7 ++--
 .../coursecreator/actions/CCCreateLesson.java | 25 +++++++++----
 .../coursecreator/actions/CCCreateTask.java   | 35 ++++++++++++-------
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectGenerator.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectGenerator.java
index 73e5bc7edf93..b40c6c5f913d 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectGenerator.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectGenerator.java
@@ -20,6 +20,8 @@ import icons.CourseCreatorIcons;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.coursecreator.actions.CCCreateLesson;
+import org.jetbrains.plugins.coursecreator.actions.CCCreateTask;
 import org.jetbrains.plugins.coursecreator.format.Course;
 import org.jetbrains.plugins.coursecreator.ui.CCNewProjectPanel;
 
@@ -69,9 +71,10 @@ public class CCProjectGenerator extends PythonProjectGenerator implements Direct
         catch (Exception ignored) {
         }
         DirectoryUtil.createSubdirectories("hints", projectDir, "\\/");
+        final PsiDirectory lessonDir = CCCreateLesson.createLesson(projectDir, 1, null, null, course);
+        CCCreateTask.createTask(null, project, lessonDir, false);
       }
     }.execute();
-
   }
 
   @NotNull
@@ -81,7 +84,7 @@ public class CCProjectGenerator extends PythonProjectGenerator implements Direct
     message = mySettingsPanel.getDescription().equals("") ? "Enter description" : message;
     message = mySettingsPanel.getAuthor().equals("") ? "Enter author name" : message;
     message = mySettingsPanel.getName().equals("") ? "Enter course name" : message;
-    return message.equals("")? ValidationResult.OK : new ValidationResult(message) ;
+    return message.equals("") ? ValidationResult.OK : new ValidationResult(message);
   }
 
   @Nullable
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateLesson.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateLesson.java
index bd7cb83ecc99..58b950b5a637 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateLesson.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateLesson.java
@@ -14,6 +14,7 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.coursecreator.CCProjectService;
 import org.jetbrains.plugins.coursecreator.format.Course;
 import org.jetbrains.plugins.coursecreator.format.Lesson;
@@ -43,17 +44,27 @@ public class CCCreateLesson extends DumbAwareAction {
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       @Override
       public void run() {
-        final PsiDirectory lessonDirectory = DirectoryUtil.createSubdirectories("lesson" + (size+1), directory, "\\/");
-        if (lessonDirectory != null) {
-          view.selectElement(lessonDirectory);
-          final Lesson lesson = new Lesson(lessonName);
-          lesson.setIndex(size + 1);
-          course.addLesson(lesson, lessonDirectory);
-        }
+        createLesson(directory, size + 1, lessonName, view, course);
       }
     });
   }
 
+  @Nullable
+  public static PsiDirectory createLesson(@NotNull final  PsiDirectory projectDir, int index, String name, final IdeView view,
+                                  @NotNull final Course course) {
+    String lessonFolderName = "lesson" + index;
+    final PsiDirectory lessonDirectory = DirectoryUtil.createSubdirectories("lesson" + index, projectDir, "\\/");
+    if (lessonDirectory != null) {
+      if (view != null) {
+        view.selectElement(lessonDirectory);
+      }
+      final Lesson lesson = new Lesson(name != null ? name : lessonFolderName);
+      lesson.setIndex(index);
+      course.addLesson(lesson, lessonDirectory);
+    }
+    return lessonDirectory;
+  }
+
   @Override
   public void update(@NotNull AnActionEvent event) {
     if (!CCProjectService.setCCActionAvailable(event)) {
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateTask.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateTask.java
index fed406ec8df0..a0a16687bf23 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateTask.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateTask.java
@@ -36,24 +36,35 @@ public class CCCreateTask extends DumbAwareAction {
     final IdeView view = e.getData(LangDataKeys.IDE_VIEW);
     final Project project = e.getData(CommonDataKeys.PROJECT);
 
-    if (view == null || project == null) {
+    if (project == null) {
       return;
     }
     final PsiDirectory directory = DirectoryChooserUtil.getOrChooseDirectory(view);
 
     if (directory == null) return;
+    createTask(view, project, directory, true);
+  }
+
+  public static void createTask(final IdeView view, final Project project, final PsiDirectory lessonDir, boolean showDialog) {
     final CCProjectService service = CCProjectService.getInstance(project);
     final Course course = service.getCourse();
-    final Lesson lesson = course.getLesson(directory.getName());
+    final Lesson lesson = course.getLesson(lessonDir.getName());
     final int size = lesson.getTaskList().size();
+    final String taskName;
+    if (showDialog) {
+      taskName = Messages.showInputDialog("Name:", "Task Name", null, "task" + (size + 1), null);
+    }
+    else {
+      taskName = "task" + (size + 1);
+    }
 
-    final String taskName = Messages.showInputDialog("Name:", "Task Name", null, "task" + (size + 1), null);
-    if (taskName == null) return;
-
+    if (taskName == null) {
+      return;
+    }
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       @Override
       public void run() {
-        final PsiDirectory taskDirectory = DirectoryUtil.createSubdirectories("task" + (size + 1), directory, "\\/");
+        final PsiDirectory taskDirectory = DirectoryUtil.createSubdirectories("task" + (size + 1), lessonDir, "\\/");
         if (taskDirectory != null) {
           final FileTemplate template = FileTemplateManager.getInstance().getInternalTemplate("task.html");
           final FileTemplate testsTemplate = FileTemplateManager.getInstance().getInternalTemplate("tests");
@@ -74,16 +85,17 @@ public class CCCreateTask extends DumbAwareAction {
                 for (VirtualFile virtualFile : fileEditorManager.getOpenFiles()) {
                   fileEditorManager.closeFile(virtualFile);
                 }
-                EditorHelper.openInEditor(testsFile, false);
-                EditorHelper.openInEditor(taskPyFile, false);
-                view.selectElement(taskFile);
+                if (view != null) {
+                  EditorHelper.openInEditor(testsFile, false);
+                  EditorHelper.openInEditor(taskPyFile, false);
+                  view.selectElement(taskFile);
+                  EditorHelper.openInEditor(taskFile, false);
+                }
               }
             });
           }
           catch (Exception ignored) {
           }
-
-
         }
       }
     });
@@ -126,6 +138,5 @@ public class CCCreateTask extends DumbAwareAction {
 
     presentation.setVisible(true);
     presentation.setEnabled(true);
-
   }
 }
\ No newline at end of file

From 1c5e8af32e92a647ebdcb9fa193f39bee6eb9da8 Mon Sep 17 00:00:00 2001
From: "liana.bakradze" <liana.bakradze@jetbrains.com>
Date: Fri, 24 Oct 2014 21:55:46 +0400
Subject: [PATCH 033/132] EDU-225 Don't allow to add nested task windows

---
 .../actions/CCAddTaskWindow.java              | 39 +++++++++++++++++--
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java
index 6c2635fc2273..951a5e85582b 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java
@@ -18,11 +18,27 @@ import org.jetbrains.plugins.coursecreator.CCProjectService;
 import org.jetbrains.plugins.coursecreator.format.*;
 import org.jetbrains.plugins.coursecreator.ui.CreateTaskWindowDialog;
 
+import java.util.List;
+
 public class CCAddTaskWindow extends DumbAwareAction {
   private static final Logger LOG = Logger.getInstance(CCAddTaskWindow.class);
 
   public CCAddTaskWindow() {
-    super("Add problem to solve","Add problem to solve", null);
+    super("Add problem to solve", "Add problem to solve", null);
+  }
+
+
+  private static boolean areTaskWindowsIntersect(@NotNull final TaskFile taskFile, @NotNull final Document document, int start, int end) {
+    List<TaskWindow> taskWindows = taskFile.getTaskWindows();
+    for (TaskWindow existingTaskWindow : taskWindows) {
+      int twStart = existingTaskWindow.getRealStartOffset(document);
+      int twEnd = existingTaskWindow.getReplacementLength() + twStart;
+      if ((start >= twStart && start < twEnd) || (end > twStart && end <= twEnd) ||
+          (twStart >= start && twStart < end) || (twEnd > start && twEnd <= end)) {
+        return true;
+      }
+    }
+    return false;
   }
 
   @Override
@@ -35,7 +51,6 @@ public class CCAddTaskWindow extends DumbAwareAction {
     if (file == null) return;
     final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext());
     if (editor == null) return;
-
     final SelectionModel model = editor.getSelectionModel();
     final Document document = PsiDocumentManager.getInstance(project).getDocument(file);
     if (document == null) return;
@@ -54,8 +69,16 @@ public class CCAddTaskWindow extends DumbAwareAction {
     final Lesson lesson = course.getLesson(lessonDir.getName());
     final Task task = lesson.getTask(taskDir.getName());
     final TaskFile taskFile = task.getTaskFile(file.getName());
+    if (taskFile == null) {
+      return;
+    }
+    if (areTaskWindowsIntersect(taskFile, document, start, end)) {
+      return;
+    }
     final TaskWindow taskWindow = new TaskWindow(lineNumber, realStart, length, model.getSelectedText());
-    CreateTaskWindowDialog dlg = new CreateTaskWindowDialog(project, taskWindow, lesson.getIndex(), task.getIndex(), file.getVirtualFile().getNameWithoutExtension(), taskFile.getTaskWindows().size() + 1);
+    CreateTaskWindowDialog dlg = new CreateTaskWindowDialog(project, taskWindow, lesson.getIndex(),
+                                                            task.getIndex(), file.getVirtualFile().getNameWithoutExtension(),
+                                                            taskFile.getTaskWindows().size() + 1);
     dlg.show();
     if (dlg.getExitCode() != DialogWrapper.OK_EXIT_CODE) {
       return;
@@ -85,11 +108,14 @@ public class CCAddTaskWindow extends DumbAwareAction {
       presentation.setEnabled(false);
       return;
     }
-    if (!editor.getSelectionModel().hasSelection()) {
+    SelectionModel selectionModel = editor.getSelectionModel();
+    if (!selectionModel.hasSelection()) {
       presentation.setVisible(false);
       presentation.setEnabled(false);
       return;
     }
+    int start = selectionModel.getSelectionStart();
+    int end = selectionModel.getSelectionEnd();
 
     final CCProjectService service = CCProjectService.getInstance(project);
     final Course course = service.getCourse();
@@ -116,6 +142,11 @@ public class CCAddTaskWindow extends DumbAwareAction {
       presentation.setEnabled(false);
       return;
     }
+    if (areTaskWindowsIntersect(taskFile, editor.getDocument(), start, end)) {
+      presentation.setVisible(false);
+      presentation.setEnabled(false);
+      return;
+    }
     presentation.setVisible(true);
     presentation.setEnabled(true);
   }

From 1ec2de9c8b6e486b4f9bd8fc90302dd8c6e0bdea Mon Sep 17 00:00:00 2001
From: "liana.bakradze" <liana.bakradze@jetbrains.com>
Date: Fri, 24 Oct 2014 23:02:32 +0400
Subject: [PATCH 034/132] EDU-194 Add actions to change course
 author/description

---
 .../resources/META-INF/plugin.xml             |   3 +
 .../actions/CCChangeCourseInfo.java           | 106 ++++++++++++++++++
 .../plugins/coursecreator/format/Course.java  |  16 +++
 .../coursecreator/ui/CCNewProjectPanel.java   |  11 +-
 4 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java

diff --git a/python/edu/course-creator/resources/META-INF/plugin.xml b/python/edu/course-creator/resources/META-INF/plugin.xml
index 7173f9d1c15b..f4e0d510a8d8 100644
--- a/python/edu/course-creator/resources/META-INF/plugin.xml
+++ b/python/edu/course-creator/resources/META-INF/plugin.xml
@@ -48,6 +48,9 @@
     <action id="CreateLesson" class="org.jetbrains.plugins.coursecreator.actions.CCCreateLesson">
       <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFile"/>
     </action>
+    <action id="ChangeCourseInfo" class="org.jetbrains.plugins.coursecreator.actions.CCChangeCourseInfo">
+      <add-to-group group-id="ProjectViewPopupMenu" anchor="before" relative-to-action="PackCourse"/>
+    </action>
     <action id="CreateTaskFile" class="org.jetbrains.plugins.coursecreator.actions.CCCreateTaskFile">
       <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFile"/>
     </action>
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java
new file mode 100644
index 000000000000..0f3b3ae4a092
--- /dev/null
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java
@@ -0,0 +1,106 @@
+package org.jetbrains.plugins.coursecreator.actions;
+
+import com.intellij.ide.IdeView;
+import com.intellij.ide.util.DirectoryChooserUtil;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.actionSystem.Presentation;
+import com.intellij.openapi.project.DumbAwareAction;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.psi.PsiDirectory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.coursecreator.CCProjectService;
+import org.jetbrains.plugins.coursecreator.format.Course;
+import org.jetbrains.plugins.coursecreator.ui.CCNewProjectPanel;
+
+import javax.swing.*;
+
+public class CCChangeCourseInfo extends DumbAwareAction {
+  public CCChangeCourseInfo() {
+    super("Change course information", "Change course information", null);
+  }
+
+  @Override
+  public void update(@NotNull AnActionEvent event) {
+    if (!CCProjectService.setCCActionAvailable(event)) {
+      return;
+    }
+    final Presentation presentation = event.getPresentation();
+    presentation.setVisible(false);
+    presentation.setEnabled(false);
+    final Project project = event.getData(CommonDataKeys.PROJECT);
+    if (project == null) {
+      return;
+    }
+    final IdeView view = event.getData(LangDataKeys.IDE_VIEW);
+    if (view == null) {
+      return;
+    }
+    final PsiDirectory[] directories = view.getDirectories();
+    if (directories.length == 0) {
+      return;
+    }
+    final PsiDirectory directory = DirectoryChooserUtil.getOrChooseDirectory(view);
+    if (directory != null && !project.getBaseDir().equals(directory.getVirtualFile())) {
+      return;
+    }
+    presentation.setVisible(true);
+    presentation.setEnabled(true);
+
+  }
+
+  @Override
+  public void actionPerformed(@NotNull AnActionEvent e) {
+    if (!CCProjectService.setCCActionAvailable(e)) {
+      return;
+    }
+    final Project project = e.getProject();
+    if (project == null) {
+      return;
+    }
+    Course course = CCProjectService.getInstance(project).getCourse();
+    if (course == null) {
+      return;
+    }
+    final IdeView view = e.getData(LangDataKeys.IDE_VIEW);
+    if (view == null) {
+      return;
+    }
+    final PsiDirectory[] directories = view.getDirectories();
+    if (directories.length == 0) {
+      return;
+    }
+    final PsiDirectory directory = DirectoryChooserUtil.getOrChooseDirectory(view);
+    if (directory != null && !project.getBaseDir().equals(directory.getVirtualFile())) {
+      return;
+    }
+    CCNewProjectPanel panel = new CCNewProjectPanel(course.getName(), course.getAuthor(), course.getDescription());
+    ChangeCourseInfoDialog changeCourseInfoDialog =
+      new ChangeCourseInfoDialog(project, panel);
+    changeCourseInfoDialog.show();
+    if (changeCourseInfoDialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
+      course.setAuthor(panel.getAuthor());
+      course.setName(panel.getName());
+      course.setDescription(panel.getDescription());
+    }
+  }
+
+  static class ChangeCourseInfoDialog extends DialogWrapper {
+
+    CCNewProjectPanel myNewProjectPanel;
+    public ChangeCourseInfoDialog(@Nullable Project project, CCNewProjectPanel panel) {
+      super(project);
+      myNewProjectPanel = panel;
+      init();
+    }
+
+    @Nullable
+    @Override
+    protected JComponent createCenterPanel() {
+      return myNewProjectPanel.getMainPanel();
+    }
+  }
+}
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/Course.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/Course.java
index e124a6eb305d..e9af3472f260 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/Course.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/Course.java
@@ -58,4 +58,20 @@ public class Course {
     }
     Collections.sort(lessons);
   }
+
+  public String getAuthor() {
+    return author;
+  }
+
+  public void setAuthor(String author) {
+    this.author = author;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
 }
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CCNewProjectPanel.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CCNewProjectPanel.java
index d463718978bb..de23a904422c 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CCNewProjectPanel.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CCNewProjectPanel.java
@@ -27,6 +27,13 @@ public class CCNewProjectPanel {
     myDescription.setLineWrap(true);
   }
 
+  public CCNewProjectPanel(String name, String author, String description) {
+    this();
+    myName.setText(name);
+    myAuthorField.setText(author);
+    myDescription.setText(description);
+  }
+
   public JPanel getMainPanel() {
     return myPanel;
   }
@@ -54,7 +61,9 @@ public class CCNewProjectPanel {
 
     @Override
     protected void textChanged(DocumentEvent e) {
-      myValidationManager.validate();
+      if (myValidationManager != null) {
+        myValidationManager.validate();
+      }
     }
   }
 }

From 59907085c15c4cb92293c8760cd31b10ddbe99f6 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Fri, 24 Oct 2014 23:00:03 +0400
Subject: [PATCH 035/132] Fix the layout of the HTTP Proxy configurable

---
 .../util/net/HttpProxySettingsUi.form         | 188 +++++++++---------
 .../util/net/HttpProxySettingsUi.java         |  18 +-
 .../src/messages/CommonBundle.properties      |  12 +-
 3 files changed, 106 insertions(+), 112 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.form b/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.form
index 3d2ae0575e1f..70561034a3ea 100644
--- a/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.form
+++ b/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.form
@@ -1,58 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.util.net.HttpProxySettingsUi">
-  <grid id="111c4" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="11" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="111c4" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="12" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="111" y="44" width="1369" height="608"/>
+      <xy x="1" y="44" width="1134" height="648"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="fe3b6" layout-manager="GridLayoutManager" row-count="8" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="5" left="20" bottom="10" right="10"/>
+      <grid id="fe3b6" layout-manager="GridLayoutManager" row-count="8" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children>
-          <component id="2a6e8" class="javax.swing.JLabel" binding="myHostNameLabel">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <labelFor value="2008d"/>
-              <text resource-bundle="messages/CommonBundle" key="editbox.host.name"/>
-            </properties>
-          </component>
-          <component id="a2263" class="javax.swing.JLabel" binding="myPortNumberLabel">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <labelFor value="7e62"/>
-              <text resource-bundle="messages/CommonBundle" key="editbox.port.number"/>
-            </properties>
-          </component>
           <component id="7e62" class="com.intellij.ui.PortField" binding="myProxyPortTextField">
             <constraints>
-              <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
           </component>
-          <component id="29784" class="javax.swing.JCheckBox" binding="myProxyAuthCheckBox">
-            <constraints>
-              <grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <margin top="2" left="1" bottom="2" right="2"/>
-              <selected value="false"/>
-              <text resource-bundle="messages/CommonBundle" key="checkbox.proxy.authentication"/>
-            </properties>
-          </component>
           <component id="fc937" class="javax.swing.JTextField" binding="myProxyLoginTextField">
             <constraints>
-              <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -62,15 +34,67 @@
           </component>
           <component id="1acb8" class="javax.swing.JPasswordField" binding="myProxyPasswordTextField">
             <constraints>
-              <grid row="6" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
             <properties/>
           </component>
+          <component id="cc77" class="javax.swing.JLabel" binding="myProxyExceptionsLabel">
+            <constraints>
+              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="messages/CommonBundle" key="label.proxy.exceptions.text"/>
+            </properties>
+          </component>
+          <component id="2008d" class="javax.swing.JTextField" binding="myProxyHostTextField">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="51cae" class="javax.swing.JCheckBox" binding="myRememberProxyPasswordCheckBox">
+            <constraints>
+              <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="messages/CommonBundle" key="checkbox.remember.password"/>
+            </properties>
+          </component>
+          <component id="2a6e8" class="javax.swing.JLabel" binding="myHostNameLabel">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <labelFor value="2008d"/>
+              <text resource-bundle="messages/CommonBundle" key="editbox.host.name"/>
+            </properties>
+          </component>
+          <component id="a2263" class="javax.swing.JLabel" binding="myPortNumberLabel">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <labelFor value="7e62"/>
+              <text resource-bundle="messages/CommonBundle" key="editbox.port.number"/>
+            </properties>
+          </component>
+          <component id="29784" class="javax.swing.JCheckBox" binding="myProxyAuthCheckBox">
+            <constraints>
+              <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <margin top="2" left="1" bottom="2" right="2"/>
+              <selected value="false"/>
+              <text resource-bundle="messages/CommonBundle" key="checkbox.proxy.authentication"/>
+            </properties>
+          </component>
           <component id="e8502" class="javax.swing.JLabel" binding="myProxyLoginLabel">
             <constraints>
-              <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="4" use-parent-layout="false"/>
             </constraints>
             <properties>
               <labelFor value="fc937"/>
@@ -79,67 +103,39 @@
           </component>
           <component id="7ced" class="javax.swing.JLabel" binding="myProxyPasswordLabel">
             <constraints>
-              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="4" use-parent-layout="false"/>
             </constraints>
             <properties>
               <labelFor value="1acb8"/>
               <text resource-bundle="messages/CommonBundle" key="editbox.password"/>
             </properties>
           </component>
-          <component id="51cae" class="javax.swing.JCheckBox" binding="myRememberProxyPasswordCheckBox">
+          <component id="8655a" class="com.intellij.ui.RawCommandLineEditor" binding="myProxyExceptions">
             <constraints>
-              <grid row="7" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <margin top="2" left="15" bottom="2" right="2"/>
-              <text resource-bundle="messages/CommonBundle" key="checkbox.remember.password"/>
-            </properties>
-          </component>
-          <component id="a16e5" class="javax.swing.JTextArea" binding="myProxyExceptions">
-            <constraints>
-              <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="50"/>
-              </grid>
-            </constraints>
-            <properties>
-              <lineWrap value="true"/>
-              <toolTipText value=""/>
+              <dialogCaption value="Proxy exceptions"/>
             </properties>
           </component>
           <component id="ad79c" class="javax.swing.JLabel" binding="myNoProxyForLabel">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="No proxy for:"/>
             </properties>
           </component>
-          <component id="cc77" class="javax.swing.JLabel" binding="myProxyExceptionsLabel">
-            <constraints>
-              <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text resource-bundle="messages/CommonBundle" key="label.proxy.exceptions.text"/>
-            </properties>
-          </component>
-          <component id="2008d" class="javax.swing.JTextField" binding="myProxyHostTextField">
-            <constraints>
-              <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="-1"/>
-              </grid>
-            </constraints>
-            <properties/>
-          </component>
         </children>
       </grid>
       <vspacer id="53d33">
         <constraints>
-          <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="11" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <component id="862df" class="com.intellij.ui.components.JBRadioButton" binding="myAutoDetectProxyRb" default-binding="true">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text resource-bundle="messages/CommonBundle" key="checkbox.use.http.proxy.pac"/>
@@ -148,23 +144,25 @@
       </component>
       <component id="9e485" class="com.intellij.ui.components.JBRadioButton" binding="myUseHTTPProxyRb" default-binding="true">
         <constraints>
-          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text resource-bundle="messages/CommonBundle" key="checkbox.use.http.proxy"/>
         </properties>
       </component>
-      <component id="4b9f9" class="com.intellij.ui.components.JBLabel" binding="mySystemProxyDefined">
+      <component id="4b9f9" class="javax.swing.JLabel" binding="mySystemProxyDefined">
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text resource-bundle="messages/CommonBundle" key="label.system.proxy.used"/>
+          <verticalAlignment value="0"/>
+          <verticalTextPosition value="1"/>
         </properties>
       </component>
       <component id="b027d" class="com.intellij.ui.components.JBRadioButton" binding="myNoProxyRb">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text resource-bundle="messages/CommonBundle" key="http.noproxy"/>
@@ -173,14 +171,14 @@
       <grid id="1bb9b" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children>
           <component id="5a9f8" class="com.intellij.ui.components.JBRadioButton" binding="myHTTP">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="2" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="messages/CommonBundle" key="http.proxy.type"/>
@@ -188,7 +186,7 @@
           </component>
           <component id="2538c" class="com.intellij.ui.components.JBRadioButton" binding="mySocks">
             <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="2" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="messages/CommonBundle" key="socks.proxy.type"/>
@@ -198,7 +196,7 @@
       </grid>
       <component id="ffae6" class="javax.swing.JLabel" binding="myErrorLabel">
         <constraints>
-          <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Label"/>
@@ -206,22 +204,24 @@
       </component>
       <component id="de36" class="javax.swing.JButton" binding="myCheckButton">
         <constraints>
-          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Check connection"/>
         </properties>
       </component>
-      <component id="98030" class="com.intellij.ui.components.JBLabel" binding="myOtherWarning">
+      <component id="98030" class="javax.swing.JLabel" binding="myOtherWarning">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
+        <properties>
+          <verticalTextPosition value="1"/>
+        </properties>
       </component>
-      <grid id="fee34" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="fee34" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -234,14 +234,6 @@
               <text resource-bundle="messages/CommonBundle" key="checkbox.automatic.proxy.configuration.url"/>
             </properties>
           </component>
-          <component id="c299" class="javax.swing.JButton" binding="myClearPasswordsButton" default-binding="true">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text resource-bundle="messages/CommonBundle" key="autodetected.proxies.clear.button"/>
-            </properties>
-          </component>
           <component id="77d11" class="javax.swing.JTextField" binding="myPacUrlTextField">
             <constraints>
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
@@ -252,6 +244,14 @@
           </component>
         </children>
       </grid>
+      <component id="c299" class="javax.swing.JButton" binding="myClearPasswordsButton" default-binding="true">
+        <constraints>
+          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text resource-bundle="messages/CommonBundle" key="autodetected.proxies.clear.button"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.java b/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.java
index e71d8e5af4ec..f4c849f015f7 100644
--- a/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.java
+++ b/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.java
@@ -21,17 +21,16 @@ import com.google.common.net.InternetDomainName;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.options.ConfigurableUi;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.ui.MultiLineLabelUI;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.openapi.wm.IdeFrame;
 import com.intellij.ui.PortField;
-import com.intellij.ui.components.JBLabel;
+import com.intellij.ui.RawCommandLineEditor;
+import com.intellij.ui.RelativeFont;
 import com.intellij.ui.components.JBRadioButton;
 import com.intellij.util.proxy.CommonProxy;
 import com.intellij.util.proxy.JavaProxyProperty;
-import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -59,16 +58,16 @@ class HttpProxySettingsUi implements ConfigurableUi<HttpConfigurable> {
   private JLabel myPortNumberLabel;
   private JBRadioButton myAutoDetectProxyRb;
   private JBRadioButton myUseHTTPProxyRb;
-  private JBLabel mySystemProxyDefined;
+  private JLabel mySystemProxyDefined;
   private JBRadioButton myNoProxyRb;
   private JBRadioButton myHTTP;
   private JBRadioButton mySocks;
   private JButton myClearPasswordsButton;
   private JLabel myErrorLabel;
   private JButton myCheckButton;
-  private JBLabel myOtherWarning;
+  private JLabel myOtherWarning;
   private JLabel myProxyExceptionsLabel;
-  private JTextArea myProxyExceptions;
+  private RawCommandLineEditor myProxyExceptions;
   private JLabel myNoProxyForLabel;
   private JCheckBox myPacUrlCheckBox;
   private JTextField myPacUrlTextField;
@@ -106,14 +105,11 @@ class HttpProxySettingsUi implements ConfigurableUi<HttpConfigurable> {
     proxyTypeGroup.add(mySocks);
     myHTTP.setSelected(true);
 
-    myProxyExceptions.setBorder(UIUtil.getTextFieldBorder());
-
     Boolean property = Boolean.getBoolean(JavaProxyProperty.USE_SYSTEM_PROXY);
     mySystemProxyDefined.setVisible(Boolean.TRUE.equals(property));
     if (Boolean.TRUE.equals(property)) {
       mySystemProxyDefined.setIcon(Messages.getWarningIcon());
-      mySystemProxyDefined.setFont(mySystemProxyDefined.getFont().deriveFont(Font.BOLD));
-      mySystemProxyDefined.setUI(new MultiLineLabelUI());
+      RelativeFont.BOLD.install(mySystemProxyDefined);
     }
 
     myProxyAuthCheckBox.addActionListener(new ActionListener() {
@@ -270,7 +266,6 @@ class HttpProxySettingsUi implements ConfigurableUi<HttpConfigurable> {
     myOtherWarning.setVisible(oldStyleText != null);
     if (oldStyleText != null) {
       myOtherWarning.setText(oldStyleText);
-      myOtherWarning.setUI(new MultiLineLabelUI());
       myOtherWarning.setIcon(Messages.getWarningIcon());
     }
   }
@@ -354,7 +349,6 @@ class HttpProxySettingsUi implements ConfigurableUi<HttpConfigurable> {
     mySocks.setEnabled(enabled);
     myHTTP.setEnabled(enabled);
     myProxyExceptions.setEnabled(enabled);
-    myProxyExceptions.setBackground(myProxyPortTextField.getBackground());
     myProxyExceptionsLabel.setEnabled(enabled);
     myNoProxyForLabel.setEnabled(enabled);
 
diff --git a/platform/platform-resources-en/src/messages/CommonBundle.properties b/platform/platform-resources-en/src/messages/CommonBundle.properties
index 1fbbd0a61f57..a8f41d9f5cf0 100644
--- a/platform/platform-resources-en/src/messages/CommonBundle.properties
+++ b/platform/platform-resources-en/src/messages/CommonBundle.properties
@@ -159,16 +159,16 @@ safe.write.rename.backup=Cannot save {0}.\nThe file was renamed to {1}.\nYour ch
 safe.write.drop.temp=Cannot delete temporary file {0}.
 
 vfs.broken.link=Broken link
-label.system.proxy.used=You have JVM property 'java.net.useSystemProxies' set to true.\n\
-This will cause some network calls to go through operating system-defined proxy.\n\
+label.system.proxy.used=<html>You have JVM property 'java.net.useSystemProxies' set to true.<br>\
+This will cause some network calls to go through operating system-defined proxy.<br>\
 If you didn't intend to use system-defined proxy, disable this property
 http.noproxy=No proxy
 http.proxy.type=HTTP
 socks.proxy.type=SOCKS
 autodetected.proxies.clear.button=Clear passwords
-label.old.way.jvm.property.used=You have JVM property \"{0}\" set to \"{1}\".\n\
-This may lead to incorrect behaviour. Proxy should be set in Settings | HTTP Proxy\n\
-This JVM property is old and its usage is not recommended by Oracle.\n\
-\n(Note: It could have been assigned by some code dynamically.)
+label.old.way.jvm.property.used=<html>You have JVM property \"{0}\" set to \"{1}\".<br>\
+This may lead to incorrect behaviour. Proxy should be set in Settings | HTTP Proxy<br>\
+This JVM property is old and its usage is not recommended by Oracle.<br>\
+(Note: It could have been assigned by some code dynamically.)
 label.proxy.exceptions.text=Example\: *.domain.com, 192.168.*
 checkbox.automatic.proxy.configuration.url=Automatic proxy configuration URL\:
\ No newline at end of file

From 4c15edec5ce3c976f2d5870cec85f7645180faab Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 24 Oct 2014 21:46:41 +0200
Subject: [PATCH 036/132] Cleanup (formatting)

---
 .../modules/decompiler/ExprProcessor.java     | 25 +++++++++----------
 .../decompiler/exps/InvocationExprent.java    | 12 +++++----
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 6bf80725bf88..edccefe2405e 100644
--- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -855,8 +855,12 @@ public class ExprProcessor implements CodeConstants {
     return defaultval;
   }
 
-  public static boolean getCastedExprent(Exprent exprent, VarType leftType, TextBuffer buffer, int indent,
-                                                               boolean castNull, BytecodeMappingTracer tracer) {
+  public static boolean getCastedExprent(Exprent exprent,
+                                         VarType leftType,
+                                         TextBuffer buffer,
+                                         int indent,
+                                         boolean castNull,
+                                         BytecodeMappingTracer tracer) {
     return getCastedExprent(exprent, leftType, buffer, indent, castNull, false, tracer);
   }
 
@@ -865,7 +869,8 @@ public class ExprProcessor implements CodeConstants {
                                          TextBuffer buffer,
                                          int indent,
                                          boolean castNull,
-                                         boolean castAlways, BytecodeMappingTracer tracer) {
+                                         boolean castAlways,
+                                         BytecodeMappingTracer tracer) {
 
     boolean ret = false;
     VarType rightType = exprent.getExprType();
@@ -873,16 +878,10 @@ public class ExprProcessor implements CodeConstants {
     TextBuffer res = exprent.toJava(indent, tracer);
 
     boolean cast =
-      !leftType.isSuperset(rightType) && (rightType.equals(VarType.VARTYPE_OBJECT) || leftType.type != CodeConstants.TYPE_OBJECT);
-    cast |= castAlways;
-
-    if (!cast && castNull && rightType.type == CodeConstants.TYPE_NULL) {
-      // check for a nameless anonymous class
-      cast = !UNDEFINED_TYPE_STRING.equals(getTypeName(leftType));
-    }
-    if (!cast) {
-      cast = isIntConstant(exprent) && VarType.VARTYPE_INT.isStrictSuperset(leftType);
-    }
+      castAlways ||
+      (!leftType.isSuperset(rightType) && (rightType.equals(VarType.VARTYPE_OBJECT) || leftType.type != CodeConstants.TYPE_OBJECT)) ||
+      (castNull && rightType.type == CodeConstants.TYPE_NULL && !UNDEFINED_TYPE_STRING.equals(getTypeName(leftType))) ||
+      (isIntConstant(exprent) && VarType.VARTYPE_INT.isStrictSuperset(leftType));
 
     if (cast) {
       if (exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST)) {
diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 57711eee2bd0..b80b745c04e2 100644
--- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -357,21 +357,23 @@ public class InvocationExprent extends Exprent {
 
     Set<Integer> setAmbiguousParameters = getAmbiguousParameters();
 
-    boolean firstpar = true;
+    boolean firstParameter = true;
     int start = isEnum ? 2 : 0;
     for (int i = start; i < lstParameters.size(); i++) {
       if (sigFields == null || sigFields.get(i) == null) {
-        if (!firstpar) {
+        if (!firstParameter) {
           buf.append(", ");
         }
 
         TextBuffer buff = new TextBuffer();
-        ExprProcessor.getCastedExprent(lstParameters.get(i), descriptor.params[i], buff, indent, true, setAmbiguousParameters.contains(i), tracer);
-
+        boolean ambiguous = setAmbiguousParameters.contains(i);
+        ExprProcessor.getCastedExprent(lstParameters.get(i), descriptor.params[i], buff, indent, true, ambiguous, tracer);
         buf.append(buff);
-        firstpar = false;
+
+        firstParameter = false;
       }
     }
+
     buf.append(")");
 
     return buf;

From 8f67ad587e6dcf8d12198cf628493924ced4ec3b Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 24 Oct 2014 20:44:56 +0200
Subject: [PATCH 037/132] "might not have been initialized" adjusted for
 lambdas inside anonymous (IDEA-130468)

---
 .../analysis/HighlightControlFlowUtil.java    |  2 +-
 ...ghtNotHaveBeenInitializedInsideLambda.java | 66 +++++++++++++++++++
 .../lambda/LightAdvHighlightingJdk8Test.java  |  4 ++
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/advHighlighting/FinalVariableMightNotHaveBeenInitializedInsideLambda.java

diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
index 43282b614544..d1c5d9bec832 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
@@ -260,7 +260,7 @@ public class HighlightControlFlowUtil {
     }
     else {
       PsiElement scope = variable instanceof PsiField
-                               ? variable.getContainingFile()
+                               ? ((PsiField)variable).getContainingClass()
                                : variable.getParent() != null ? variable.getParent().getParent() : null;
       if (scope instanceof PsiCodeBlock && scope.getParent() instanceof PsiSwitchStatement) {
         scope = PsiTreeUtil.getParentOfType(scope, PsiCodeBlock.class);
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/advHighlighting/FinalVariableMightNotHaveBeenInitializedInsideLambda.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/advHighlighting/FinalVariableMightNotHaveBeenInitializedInsideLambda.java
new file mode 100644
index 000000000000..c8e80cc743c4
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/advHighlighting/FinalVariableMightNotHaveBeenInitializedInsideLambda.java
@@ -0,0 +1,66 @@
+class Test {
+  final Runnable runnable;
+
+  {
+    runnable = () -> System.out.println(<error descr="Variable 'runnable' might not have been initialized">runnable</error>);
+  }
+
+  final Runnable runnable1;
+  {
+    runnable1 = new Runnable() {
+      @Override
+      public void run() {
+        System.out.println(runnable1);
+      }
+    };
+  }
+
+}
+
+abstract class TestInnerAnonymous {
+
+
+  void foo() {
+    new Object() {
+      final Runnable runnable;
+
+      {
+        runnable = () -> System.out.println(<error descr="Variable 'runnable' might not have been initialized">runnable</error>);
+      }
+
+      final Runnable runnable1;
+
+      {
+        runnable1 = new Runnable() {
+          @Override
+          public void run() {
+            System.out.println(runnable1);
+          }
+        };
+      }
+
+    };
+  }
+
+
+  private static class MyObject {
+    final Runnable runnable;
+
+    {
+      runnable = () -> System.out.println(<error descr="Variable 'runnable' might not have been initialized">runnable</error>);
+    }
+
+    final Runnable runnable1;
+
+    {
+      runnable1 = new Runnable() {
+        @Override
+        public void run() {
+          System.out.println(runnable1);
+        }
+      };
+    }
+
+  }
+}
+
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LightAdvHighlightingJdk8Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LightAdvHighlightingJdk8Test.java
index 08a2b63550ff..4ecf0b2b434e 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LightAdvHighlightingJdk8Test.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LightAdvHighlightingJdk8Test.java
@@ -39,6 +39,10 @@ public class LightAdvHighlightingJdk8Test extends LightDaemonAnalyzerTestCase {
     doTest();
   }
 
+  public void testFinalVariableMightNotHaveBeenInitializedInsideLambda() throws Exception {
+    doTest();
+  }
+
   private void doTest() {
     IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable());
     doTest(BASE_PATH + "/" + getTestName(false) + ".java", true, false);

From 7184d46d8ad923c922d1d1e81be730ce8a1289dc Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 24 Oct 2014 21:44:38 +0200
Subject: [PATCH 038/132] new inference: compare classes from different jdks
 (IDEA-131888)

---
 .../graphInference/constraints/TypeEqualityConstraint.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java
index 62f1ff1d819c..03b20b3fb443 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java
@@ -91,7 +91,7 @@ public class TypeEqualityConstraint implements ConstraintFormula {
       final PsiClassType.ClassResolveResult sResult = ((PsiClassType)myS).resolveGenerics();
       final PsiClass tClass = tResult.getElement();
       //equal erasure
-      if (tClass != null && tClass.equals(sResult.getElement())) {
+      if (tClass != null && tClass.getManager().areElementsEquivalent(tClass, sResult.getElement())) {
         final PsiSubstitutor tSubstitutor = tResult.getSubstitutor();
         final PsiSubstitutor sSubstitutor = sResult.getSubstitutor();
         for (PsiTypeParameter typeParameter : tClass.getTypeParameters()) {

From 19a15f5573c650d59f2efb5bb13145258ff8b355 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 24 Oct 2014 21:49:02 +0200
Subject: [PATCH 039/132] Cleanup (unneeded variable)

---
 .../java/decompiler/modules/decompiler/ExprProcessor.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index edccefe2405e..16ef95b38a3c 100644
--- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -872,7 +872,6 @@ public class ExprProcessor implements CodeConstants {
                                          boolean castAlways,
                                          BytecodeMappingTracer tracer) {
 
-    boolean ret = false;
     VarType rightType = exprent.getExprType();
 
     TextBuffer res = exprent.toJava(indent, tracer);
@@ -889,12 +888,11 @@ public class ExprProcessor implements CodeConstants {
       }
 
       res.prepend("(" + getCastTypeName(leftType) + ")");
-      ret = true;
     }
 
     buffer.append(res);
 
-    return ret;
+    return cast;
   }
 
   private static boolean isIntConstant(Exprent exprent) {

From e482b1021618108e454c7540b43ad7dd3d21bb08 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Sat, 25 Oct 2014 15:24:40 +0400
Subject: [PATCH 040/132] fixed EDU-236 Open first task after project creation

---
 .../edu/StudyDirectoryProjectGenerator.java   | 54 +++++++++++++++++--
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java b/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
index b558667734bc..4d389cd06294 100644
--- a/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
+++ b/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
@@ -5,19 +5,27 @@ import com.google.gson.stream.JsonReader;
 import com.intellij.facet.ui.FacetEditorValidator;
 import com.intellij.facet.ui.FacetValidatorsManager;
 import com.intellij.facet.ui.ValidationResult;
+import com.intellij.ide.projectView.ProjectView;
+import com.intellij.ide.projectView.impl.AbstractProjectViewPane;
 import com.intellij.lang.javascript.boilerplate.GithubDownloadUtil;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.wm.ex.ToolWindowManagerAdapter;
+import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
 import com.intellij.platform.DirectoryProjectGenerator;
 import com.intellij.platform.templates.github.GeneratorException;
 import com.intellij.platform.templates.github.ZipUtil;
-import com.jetbrains.python.edu.course.Course;
-import com.jetbrains.python.edu.course.CourseInfo;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
+import com.jetbrains.python.edu.course.*;
 import com.jetbrains.python.edu.ui.StudyNewProjectPanel;
 import com.jetbrains.python.newProject.PythonProjectGenerator;
 import icons.StudyIcons;
@@ -150,12 +158,52 @@ public class StudyDirectoryProjectGenerator extends PythonProjectGenerator imple
     try {
       reader = new InputStreamReader(new FileInputStream(mySelectedCourseFile));
       Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create();
-      Course course = gson.fromJson(reader, Course.class);
+      final Course course = gson.fromJson(reader, Course.class);
       course.init(false);
       course.create(baseDir, new File(mySelectedCourseFile.getParent()));
       course.setResourcePath(mySelectedCourseFile.getAbsolutePath());
       VirtualFileManager.getInstance().refreshWithoutFileWatcher(true);
       StudyTaskManager.getInstance(project).setCourse(course);
+      final boolean[] initialized = {false};
+      ToolWindowManagerEx.getInstanceEx(myProject).addToolWindowManagerListener(new ToolWindowManagerAdapter() {
+        @Override
+        public void stateChanged() {
+          final AbstractProjectViewPane projectViewPane = ProjectView.getInstance(myProject).getCurrentProjectViewPane();
+          if (projectViewPane == null || initialized[0]) return;
+          JTree tree = projectViewPane.getTree();
+          tree.updateUI();
+
+          ApplicationManager.getApplication().invokeLater(new Runnable() {
+            @Override
+            public void run() {
+              LocalFileSystem.getInstance().refresh(false);
+              final Lesson firstLesson = StudyUtils.getFirst(course.getLessons());
+              final Task firstTask = StudyUtils.getFirst(firstLesson.getTaskList());
+              final VirtualFile taskDir = firstTask.getTaskDir(myProject);
+              if (taskDir == null) return;
+              final Map<String, TaskFile> taskFiles = firstTask.getTaskFiles();
+
+              VirtualFile activeVirtualFile = null;
+              for (Map.Entry<String, TaskFile> entry : taskFiles.entrySet()) {
+                final String name = entry.getKey();
+                final TaskFile taskFile = entry.getValue();
+                final VirtualFile virtualFile = taskDir.findChild(name);
+                if (virtualFile != null) {
+                  FileEditorManager.getInstance(project).openFile(virtualFile, true);
+                  if (!taskFile.getTaskWindows().isEmpty()) {
+                    activeVirtualFile = virtualFile;
+                  }
+                }
+              }
+              if (activeVirtualFile != null) {
+                final PsiFile file = PsiManager.getInstance(myProject).findFile(activeVirtualFile);
+                ProjectView.getInstance(project).select(file, activeVirtualFile, true);
+                initialized[0] = true;
+              }
+            }
+          });
+        }
+      });
     }
     catch (FileNotFoundException e) {
       LOG.error(e);

From 60134295c03b77f46190287d8a41a92b0e898e15 Mon Sep 17 00:00:00 2001
From: "liana.bakradze" <liana.bakradze@jetbrains.com>
Date: Sat, 25 Oct 2014 20:29:22 +0400
Subject: [PATCH 041/132] fixed NPE while opening first task in new study
 project

---
 .../jetbrains/python/edu/StudyDirectoryProjectGenerator.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java b/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
index 4d389cd06294..6d4270788b82 100644
--- a/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
+++ b/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
@@ -171,6 +171,9 @@ public class StudyDirectoryProjectGenerator extends PythonProjectGenerator imple
           final AbstractProjectViewPane projectViewPane = ProjectView.getInstance(myProject).getCurrentProjectViewPane();
           if (projectViewPane == null || initialized[0]) return;
           JTree tree = projectViewPane.getTree();
+          if (tree == null) {
+            return;
+          }
           tree.updateUI();
 
           ApplicationManager.getApplication().invokeLater(new Runnable() {

From ebe34e28d5beb00db575213cdb2d32f51bc7d9c5 Mon Sep 17 00:00:00 2001
From: "liana.bakradze" <liana.bakradze@jetbrains.com>
Date: Sat, 25 Oct 2014 22:23:24 +0400
Subject: [PATCH 042/132] EDU-232 Cancel task window text editing actually
 doesn't work

---
 .../coursecreator/actions/CCShowTaskWindowDetails.java    | 8 +++-----
 .../plugins/coursecreator/ui/CreateTaskWindowDialog.java  | 4 ++++
 .../plugins/coursecreator/ui/CreateTaskWindowPanel.java   | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCShowTaskWindowDetails.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCShowTaskWindowDetails.java
index d865902a8025..e08743fc6941 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCShowTaskWindowDetails.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCShowTaskWindowDetails.java
@@ -5,10 +5,7 @@ import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.coursecreator.CCProjectService;
-import org.jetbrains.plugins.coursecreator.format.Course;
-import org.jetbrains.plugins.coursecreator.format.Lesson;
-import org.jetbrains.plugins.coursecreator.format.Task;
-import org.jetbrains.plugins.coursecreator.format.TaskFile;
+import org.jetbrains.plugins.coursecreator.format.*;
 import org.jetbrains.plugins.coursecreator.ui.CreateTaskWindowDialog;
 
 public class CCShowTaskWindowDetails extends CCTaskWindowAction {
@@ -29,7 +26,8 @@ public class CCShowTaskWindowDetails extends CCTaskWindowAction {
     final Lesson lesson = course.getLesson(lessonDir.getName());
     final Task task = lesson.getTask(taskDir.getName());
     final TaskFile taskFile = state.getTaskFile();
-    CreateTaskWindowDialog dlg = new CreateTaskWindowDialog(project, state.getTaskWindow(), lesson.getIndex(), task.getIndex(),
+    TaskWindow taskWindow = state.getTaskWindow();
+    CreateTaskWindowDialog dlg = new CreateTaskWindowDialog(project, taskWindow, lesson.getIndex(), task.getIndex(),
                                                             file.getVirtualFile().getNameWithoutExtension(),
                                                             taskFile.getTaskWindows().size() + 1);
     dlg.show();
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowDialog.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowDialog.java
index 2240d58a2846..213fc55e2cb7 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowDialog.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowDialog.java
@@ -95,6 +95,10 @@ public class CreateTaskWindowDialog extends DialogWrapper {
       myTaskWindow.setHint(hintName);
       String hintText = myPanel.getHintText();
       createHint(hintName, hintText);
+    } else {
+      if (myTaskWindow.getHintName() != null) {
+        deleteHint();
+      }
     }
     super.doOKAction();
   }
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowPanel.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowPanel.java
index 4fc64fa769c6..a09945718aaa 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowPanel.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowPanel.java
@@ -32,7 +32,7 @@ public class CreateTaskWindowPanel extends JPanel {
         // 1 for checked
         enableHint(state == 1);
         if (state == 2) {
-          myDialog.deleteHint();
+          resetHint();
         }
       }
     });

From c42a4ca54e0ee35c39253fb0fceb04fa904937e3 Mon Sep 17 00:00:00 2001
From: "liana.bakradze" <liana.bakradze@jetbrains.com>
Date: Sat, 25 Oct 2014 22:35:14 +0400
Subject: [PATCH 043/132] EDU-234 Generated python file becomes visible after
 .answer file was deleted

---
 .../plugins/coursecreator/CCProjectComponent.java      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java
index 8b524dbffd4b..88a242492581 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java
@@ -17,6 +17,7 @@ import com.intellij.openapi.vfs.VirtualFileAdapter;
 import com.intellij.openapi.vfs.VirtualFileEvent;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.coursecreator.actions.CCRunTestsAction;
 import org.jetbrains.plugins.coursecreator.format.Course;
 import org.jetbrains.plugins.coursecreator.format.Lesson;
 import org.jetbrains.plugins.coursecreator.format.Task;
@@ -158,7 +159,8 @@ public class CCProjectComponent implements ProjectComponent {
     }
 
     private void deleteTaskFile(Course course, VirtualFile removedFile) {
-      VirtualFile taskDir = removedFile.getParent();
+
+      final VirtualFile taskDir = removedFile.getParent();
       if (taskDir == null || !taskDir.getName().contains("task")) {
         return;
       }
@@ -182,6 +184,12 @@ public class CCProjectComponent implements ProjectComponent {
       if (taskFile == null) {
         return;
       }
+      ApplicationManager.getApplication().runWriteAction(new Runnable() {
+        @Override
+        public void run() {
+          CCRunTestsAction.clearTestEnvironment(taskDir, myProject);
+        }
+      });
       String name = CCProjectService.getRealTaskFileName(removedFile.getName());
       task.getTaskFiles().remove(name);
     }

From bfd3c27a641efd7acc9840b75708ae4c589f7f43 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Sun, 26 Oct 2014 01:19:33 +0400
Subject: [PATCH 044/132] Update test of JSON's structure view (broken after
 IDEA-131495)

---
 json/tests/test/com/intellij/json/JsonStructureViewTest.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/json/tests/test/com/intellij/json/JsonStructureViewTest.java b/json/tests/test/com/intellij/json/JsonStructureViewTest.java
index aa5e43cf89c5..24d563e6ef77 100644
--- a/json/tests/test/com/intellij/json/JsonStructureViewTest.java
+++ b/json/tests/test/com/intellij/json/JsonStructureViewTest.java
@@ -66,7 +66,9 @@ public class JsonStructureViewTest extends JsonTestCase {
            "  -object\n" +
            "   nestedObject\n" +
            " -array\n" +
-           "  +array\n" +
+           "  -array\n" +
+           "   -object\n" +
+           "    deepNestedObject\n" +
            " -object\n" +
            "  siblingObject\n");
   }

From 7c3a5f7047d053c065690b2788666797a125e777 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Sun, 26 Oct 2014 10:10:31 +0300
Subject: [PATCH 045/132] open first task: refresh directory, stop with project
 dispose

---
 .../python/edu/StudyDirectoryProjectGenerator.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java b/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
index 6d4270788b82..a9630f6f730c 100644
--- a/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
+++ b/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
@@ -9,15 +9,18 @@ import com.intellij.ide.projectView.ProjectView;
 import com.intellij.ide.projectView.impl.AbstractProjectViewPane;
 import com.intellij.lang.javascript.boilerplate.GithubDownloadUtil;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl;
 import com.intellij.openapi.wm.ex.ToolWindowManagerAdapter;
 import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
 import com.intellij.platform.DirectoryProjectGenerator;
@@ -190,7 +193,7 @@ public class StudyDirectoryProjectGenerator extends PythonProjectGenerator imple
               for (Map.Entry<String, TaskFile> entry : taskFiles.entrySet()) {
                 final String name = entry.getKey();
                 final TaskFile taskFile = entry.getValue();
-                final VirtualFile virtualFile = taskDir.findChild(name);
+                final VirtualFile virtualFile = ((VirtualDirectoryImpl)taskDir).refreshAndFindChild(name);
                 if (virtualFile != null) {
                   FileEditorManager.getInstance(project).openFile(virtualFile, true);
                   if (!taskFile.getTaskWindows().isEmpty()) {
@@ -204,6 +207,11 @@ public class StudyDirectoryProjectGenerator extends PythonProjectGenerator imple
                 initialized[0] = true;
               }
             }
+          }, ModalityState.current(), new Condition() {
+            @Override
+            public boolean value(Object o) {
+              return project.isDisposed();
+            }
           });
         }
       });

From 6eb19626196d439c62976dcfd1bb57d49ed73b11 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sun, 26 Oct 2014 15:05:32 +0400
Subject: [PATCH 046/132] [git] make some git push classes & methods public by
 request of gerrit plugin author

---
 .../git4idea/src/git4idea/push/GitPushTagPanel.java    |  4 ++--
 plugins/git4idea/src/git4idea/push/GitPushTarget.java  | 10 +++++-----
 .../git4idea/src/git4idea/push/GitPushTargetPanel.java |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/push/GitPushTagPanel.java b/plugins/git4idea/src/git4idea/push/GitPushTagPanel.java
index 21a86a63ac41..300d0b9d1a1a 100644
--- a/plugins/git4idea/src/git4idea/push/GitPushTagPanel.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushTagPanel.java
@@ -28,12 +28,12 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-class GitPushTagPanel extends VcsPushOptionsPanel {
+public class GitPushTagPanel extends VcsPushOptionsPanel {
 
   private final ComboBox myCombobox;
   private final JBCheckBox myCheckBox;
 
-  GitPushTagPanel(@Nullable GitPushTagMode defaultMode, boolean followTagsSupported) {
+  public GitPushTagPanel(@Nullable GitPushTagMode defaultMode, boolean followTagsSupported) {
     String checkboxText = "Push Tags";
     if (followTagsSupported) {
       checkboxText += ": ";
diff --git a/plugins/git4idea/src/git4idea/push/GitPushTarget.java b/plugins/git4idea/src/git4idea/push/GitPushTarget.java
index 467c4e7448e4..4536973b9281 100644
--- a/plugins/git4idea/src/git4idea/push/GitPushTarget.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushTarget.java
@@ -33,20 +33,20 @@ import java.util.Collection;
 
 import static git4idea.GitUtil.findRemoteBranch;
 
-class GitPushTarget implements PushTarget {
+public class GitPushTarget implements PushTarget {
 
   private static final Logger LOG = Logger.getInstance(GitPushTarget.class);
 
   @NotNull private final GitRemoteBranch myRemoteBranch;
   private final boolean myIsNewBranchCreated;
 
-  GitPushTarget(@NotNull GitRemoteBranch remoteBranch, boolean isNewBranchCreated) {
+  public GitPushTarget(@NotNull GitRemoteBranch remoteBranch, boolean isNewBranchCreated) {
     myRemoteBranch = remoteBranch;
     myIsNewBranchCreated = isNewBranchCreated;
   }
 
   @NotNull
-  GitRemoteBranch getBranch() {
+  public GitRemoteBranch getBranch() {
     return myRemoteBranch;
   }
 
@@ -55,12 +55,12 @@ class GitPushTarget implements PushTarget {
     return isNewBranchCreated();
   }
 
-  boolean isNewBranchCreated() {
+  public boolean isNewBranchCreated() {
     return myIsNewBranchCreated;
   }
 
   @NotNull
-  static GitPushTarget parse(@NotNull GitRepository repository, @Nullable String remoteName, @NotNull String branchName) throws
+  public static GitPushTarget parse(@NotNull GitRepository repository, @Nullable String remoteName, @NotNull String branchName) throws
                                                                                                                         ParseException {
     if (remoteName == null) {
       throw new ParseException("No remotes defined", -1);
diff --git a/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java b/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java
index aa03697963c8..62ecbd670d4c 100644
--- a/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java
@@ -44,7 +44,7 @@ import java.text.ParseException;
 import java.util.Comparator;
 import java.util.List;
 
-class GitPushTargetPanel extends PushTargetPanel<GitPushTarget> {
+public class GitPushTargetPanel extends PushTargetPanel<GitPushTarget> {
 
   private static final Logger LOG = Logger.getInstance(GitPushTargetPanel.class);
 

From 172d506cddc6ba0cfa91748528ffe0f68a90a8cd Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sun, 26 Oct 2014 15:11:32 +0400
Subject: [PATCH 047/132] [push] IDEA-130622 Temporary fix for "confusing
 selection" problem: select all repositories with commits.

---
 .../dvcs-impl/src/com/intellij/dvcs/push/PushController.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
index 5de06ffd7969..92e0ae772f3b 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
@@ -176,6 +176,9 @@ public class PushController implements Disposable {
     final RepositoryNode repoNode = mySingleRepoProject
                                     ? new SingleRepositoryNode(repoPanel, checkBoxModel)
                                     : new RepositoryNode(repoPanel, checkBoxModel, target != null);
+    if (!support.shouldRequestIncomingChangesForNotCheckedRepositories()) {
+      model.getCheckBoxModel().setChecked(myPreselectedRepositories.contains(repository));
+    }
     pushTargetPanel.setFireOnChangeAction(new Runnable() {
       @Override
       public void run() {
@@ -325,7 +328,7 @@ public class PushController implements Disposable {
       shouldBeSelected = hasCommits || target.hasSomethingToPush();
     }
     else {
-      shouldBeSelected = (hasCommits || target.hasSomethingToPush()) && myPreselectedRepositories.contains(repository);
+      shouldBeSelected = (hasCommits || target.hasSomethingToPush());
     }
     return shouldBeSelected;
   }

From bfc8d2343b99c31f2225c58e779c2293e3168c25 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sun, 26 Oct 2014 16:56:22 +0400
Subject: [PATCH 048/132] [vcs] cleanup: String.format() to ease reading

---
 .../vcs/roots/VcsRootProblemNotifier.java     | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
index 3b8100978094..68efc20d985b 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
@@ -133,18 +133,12 @@ public class VcsRootProblemNotifier {
     if (!invalidRoots.isEmpty()) {
       if (invalidRoots.size() == 1) {
         VcsRootError rootError = invalidRoots.iterator().next();
-        description
-          .append("The directory " +
-                  rootToDisplayableString.fun(rootError) +
-                  " is registered as a " +
-                  rootError.getVcsKey().getName() +
-                  " root, " +
-                  "but no " +
-                  rootError.getVcsKey().getName() +
-                  " repositories were found there.");
+        String vcsName = rootError.getVcsKey().getName();
+        description.append(String.format("The directory %s is registered as a %s root, but no %s repositories were found there.",
+                                         rootToDisplayableString.fun(rootError), vcsName, vcsName));
       }
       else {
-        description.append("The following directories are registered as Vcs roots, but they are not: <br/>" +
+        description.append("The following directories are registered as VCS roots, but they are not: <br/>" +
                            StringUtil.join(invalidRoots, rootToDisplayableString, ", "));
       }
       description.append("<br/>");
@@ -153,16 +147,11 @@ public class VcsRootProblemNotifier {
     if (!unregisteredRoots.isEmpty()) {
       if (unregisteredRoots.size() == 1) {
         VcsRootError unregisteredRoot = unregisteredRoots.iterator().next();
-        description
-          .append("The directory " +
-                  rootToDisplayableString.fun(unregisteredRoot) +
-                  " is under " +
-                  unregisteredRoot.getVcsKey().getName() +
-                  ", " +
-                  "but is not registered in the Settings.");
+        description.append(String.format("The directory %s is under %s, but is not registered in the Settings.",
+                                         rootToDisplayableString.fun(unregisteredRoot), unregisteredRoot.getVcsKey().getName()));
       }
       else {
-        description.append("The following directories are roots of Vcs repositories, but they are not registered in the Settings: <br/>" +
+        description.append("The following directories are roots of VCS repositories, but they are not registered in the Settings: <br/>" +
                            StringUtil.join(unregisteredRoots, rootToDisplayableString, ", "));
       }
       description.append("<br/>");

From 1dd4c35d1d88ec93e339d09d4c842ad845e3f98e Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sun, 26 Oct 2014 17:07:52 +0400
Subject: [PATCH 049/132] [vcs] Don't notify about "less interesting"
 unregistered roots

IDEA-87769 roots not under project dir;
IDEA-98781 roots under ignored directories.

But still show them in the Settings.
---
 .../vcs/roots/VcsRootProblemNotifier.java     | 49 +++++++++++++++----
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
index 68efc20d985b..c720834fa594 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
@@ -21,12 +21,16 @@ import com.intellij.notification.NotificationListener;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsDirectoryMapping;
 import com.intellij.openapi.vcs.VcsNotifier;
 import com.intellij.openapi.vcs.VcsRootError;
+import com.intellij.openapi.vcs.changes.ChangeListManager;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
@@ -35,6 +39,7 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.event.HyperlinkEvent;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 
 import static com.intellij.openapi.util.text.StringUtil.pluralize;
@@ -46,12 +51,14 @@ import static com.intellij.openapi.util.text.StringUtil.pluralize;
  */
 public class VcsRootProblemNotifier {
 
-  private final @NotNull Project myProject;
-  private final @NotNull VcsConfiguration mySettings;
+  @NotNull private final Project myProject;
+  @NotNull private final VcsConfiguration mySettings;
+  @NotNull private final ChangeListManager myChangeListManager;
+
   @NotNull private final Set<VcsRootError> myReportedUnregisteredRoots = ContainerUtil.newHashSet();
 
-  private @Nullable Notification myNotification;
-  private final @NotNull Object NOTIFICATION_LOCK = new Object();
+  @Nullable private Notification myNotification;
+  @NotNull private final Object NOTIFICATION_LOCK = new Object();
 
   public static VcsRootProblemNotifier getInstance(@NotNull Project project) {
     return new VcsRootProblemNotifier(project);
@@ -60,6 +67,7 @@ public class VcsRootProblemNotifier {
   private VcsRootProblemNotifier(@NotNull Project project) {
     myProject = project;
     mySettings = VcsConfiguration.getInstance(myProject);
+    myChangeListManager = ChangeListManager.getInstance(project);
   }
 
   public void rescanAndNotifyIfNeeded() {
@@ -76,16 +84,17 @@ public class VcsRootProblemNotifier {
     }
 
     Collection<VcsRootError> unregisteredRoots = getUnregisteredRoots(errors);
+    Collection<VcsRootError> important = getImportantMappings(unregisteredRoots);
     Collection<VcsRootError> invalidRoots = getInvalidRoots(errors);
 
-    String title = makeTitle(unregisteredRoots, invalidRoots);
-    String description = makeDescription(unregisteredRoots, invalidRoots);
-
-    if (myReportedUnregisteredRoots.containsAll(unregisteredRoots) && invalidRoots.isEmpty()) {
+    if (invalidRoots.isEmpty() && (important.isEmpty() || myReportedUnregisteredRoots.containsAll(important))) {
       return;
     }
     myReportedUnregisteredRoots.addAll(unregisteredRoots);
 
+    String title = makeTitle(unregisteredRoots, invalidRoots);
+    String description = makeDescription(unregisteredRoots, invalidRoots);
+
     synchronized (NOTIFICATION_LOCK) {
       expireNotification();
       NotificationListener listener = new MyNotificationListener(myProject, mySettings);
@@ -96,6 +105,26 @@ public class VcsRootProblemNotifier {
     }
   }
 
+  @NotNull
+  private List<VcsRootError> getImportantMappings(@NotNull Collection<VcsRootError> unregisteredRoots) {
+    return ContainerUtil.filter(unregisteredRoots, new Condition<VcsRootError>() {
+      @Override
+      public boolean value(VcsRootError error) {
+        String mapping = error.getMapping();
+        return isUnderProjectDir(mapping) && !isIgnored(mapping);
+      }
+    });
+  }
+
+  private boolean isUnderProjectDir(@NotNull String mapping) {
+    return mapping.equals(VcsDirectoryMapping.PROJECT_CONSTANT) || FileUtil.isAncestor(myProject.getBasePath(), mapping, false);
+  }
+
+  private boolean isIgnored(@NotNull String mapping) {
+    VirtualFile file = LocalFileSystem.getInstance().findFileByPath(mapping);
+    return file != null && myChangeListManager.isIgnoredFile(file);
+  }
+
   private void expireNotification() {
     if (myNotification != null) {
       final Notification notification = myNotification;
@@ -139,7 +168,7 @@ public class VcsRootProblemNotifier {
       }
       else {
         description.append("The following directories are registered as VCS roots, but they are not: <br/>" +
-                           StringUtil.join(invalidRoots, rootToDisplayableString, ", "));
+                           StringUtil.join(invalidRoots, rootToDisplayableString, "<br/>"));
       }
       description.append("<br/>");
     }
@@ -152,7 +181,7 @@ public class VcsRootProblemNotifier {
       }
       else {
         description.append("The following directories are roots of VCS repositories, but they are not registered in the Settings: <br/>" +
-                           StringUtil.join(unregisteredRoots, rootToDisplayableString, ", "));
+                           StringUtil.join(unregisteredRoots, rootToDisplayableString, "<br/>"));
       }
       description.append("<br/>");
     }

From 736e40851b33346c29d316f83656cf4d2be6f21c Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sun, 26 Oct 2014 17:21:23 +0400
Subject: [PATCH 050/132] [vcs] IDEA-131859 Fix grammar

---
 .../openapi/vcs/configurable/VcsLimitHistoryConfigurable.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsLimitHistoryConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsLimitHistoryConfigurable.java
index 07de0c4404e4..4bd2cb5c6aef 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsLimitHistoryConfigurable.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsLimitHistoryConfigurable.java
@@ -33,7 +33,7 @@ public class VcsLimitHistoryConfigurable extends VcsCheckBoxWithSpinnerConfigura
   private final VcsConfiguration myConfiguration;
 
   public VcsLimitHistoryConfigurable(Project project) {
-    super(project, "Limit history by: ", "rows");
+    super(project, "Limit history to: ", "rows");
     myConfiguration = VcsConfiguration.getInstance(myProject);
   }
 

From 2848a1695275fa386426b63c265ea9991424b5a6 Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Sun, 26 Oct 2014 21:29:46 +0400
Subject: [PATCH 051/132] IDEA-130848 Push dialog initial selection & enabling
 policy

* remember unselected roots and store in workspace.xml;
* don't select and don't load excludedRoots;
* always enable push button for mercurial;
* load all repos for git exclude remembered;
* wait until all or one repo loaded according to sync branch settings;
* always allow push for git new branch;
* preselect git repos only from project view and ignore current editor 'selection'
---
 .../com/intellij/dvcs/push/PushSettings.java  |  61 ++++++++++
 platform/dvcs-impl/src/META-INF/dvcs.xml      |   3 +
 .../intellij/dvcs/push/PushController.java    | 108 ++++++++++++++----
 .../intellij/dvcs/push/ui/VcsPushDialog.java  |  13 +++
 .../src/git4idea/actions/GitPushAction.java   |   9 +-
 .../org/zmlx/hg4idea/push/HgPushSupport.java  |   8 +-
 .../src/org/zmlx/hg4idea/push/HgTarget.java   |   4 +-
 7 files changed, 173 insertions(+), 33 deletions(-)
 create mode 100644 platform/dvcs-api/src/com/intellij/dvcs/push/PushSettings.java

diff --git a/platform/dvcs-api/src/com/intellij/dvcs/push/PushSettings.java b/platform/dvcs-api/src/com/intellij/dvcs/push/PushSettings.java
new file mode 100644
index 000000000000..e1250c3dfeb4
--- /dev/null
+++ b/platform/dvcs-api/src/com/intellij/dvcs/push/PushSettings.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.dvcs.push;
+
+import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.State;
+import com.intellij.openapi.components.Storage;
+import com.intellij.openapi.components.StoragePathMacros;
+import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.xmlb.annotations.AbstractCollection;
+import com.intellij.util.xmlb.annotations.Tag;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Set;
+
+@State(name = "Push.Settings", storages = {@Storage(file = StoragePathMacros.WORKSPACE_FILE)})
+public class PushSettings implements PersistentStateComponent<PushSettings.State> {
+
+  private State myState = new State();
+
+  public static class State {
+    @Tag("excluded-roots")
+    @AbstractCollection(surroundWithTag = false, elementTag = "path")
+    public Set<String> EXCLUDED_ROOTS = ContainerUtil.newHashSet();
+  }
+
+  @Nullable
+  @Override
+  public State getState() {
+    return myState;
+  }
+
+  @Override
+  public void loadState(State state) {
+    myState = state;
+  }
+
+  @NotNull
+  public Set<String> getExcludedRepoRoots() {
+    return myState.EXCLUDED_ROOTS;
+  }
+
+  public void saveExcludedRepoRoots(@NotNull Set<String> roots) {
+    myState.EXCLUDED_ROOTS = roots;
+  }
+}
+
diff --git a/platform/dvcs-impl/src/META-INF/dvcs.xml b/platform/dvcs-impl/src/META-INF/dvcs.xml
index aa81616f24f6..dc8a45b5f9b1 100644
--- a/platform/dvcs-impl/src/META-INF/dvcs.xml
+++ b/platform/dvcs-impl/src/META-INF/dvcs.xml
@@ -8,5 +8,8 @@
       <!--<keyboard-shortcut first-keystroke="control shift K" keymap="$default"/>-->
     <!--</action>-->
   </actions>
+  <extensions defaultExtensionNs="com.intellij">
+    <projectService serviceImplementation="com.intellij.dvcs.push.PushSettings"/>
+  </extensions>
 </idea-plugin>
 
diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
index 92e0ae772f3b..7ddeb138425f 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
@@ -18,8 +18,8 @@ package com.intellij.dvcs.push;
 import com.intellij.dvcs.DvcsUtil;
 import com.intellij.dvcs.push.ui.*;
 import com.intellij.dvcs.repo.Repository;
-import com.intellij.dvcs.repo.RepositoryManager;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
@@ -53,6 +53,8 @@ public class PushController implements Disposable {
   @NotNull private final List<PushSupport<?, ?, ?>> myPushSupports;
   @NotNull private final PushLog myPushLog;
   @NotNull private final VcsPushDialog myDialog;
+  @NotNull private final PushSettings myExcludedSettings;
+  @NotNull private final Set<String> myExcludedRepositoryRoots;
   private boolean mySingleRepoProject;
   private static final int DEFAULT_CHILDREN_PRESENTATION_NUMBER = 20;
   private final ExecutorService myExecutorService = Executors.newSingleThreadExecutor();
@@ -64,6 +66,8 @@ public class PushController implements Disposable {
                         @NotNull VcsPushDialog dialog,
                         @NotNull List<? extends Repository> preselectedRepositories) {
     myProject = project;
+    myExcludedSettings = ServiceManager.getService(project, PushSettings.class);
+    myExcludedRepositoryRoots = ContainerUtil.newHashSet(myExcludedSettings.getExcludedRepoRoots());
     myPreselectedRepositories = preselectedRepositories;
     myPushSupports = getAffectedSupports(myProject);
     mySingleRepoProject = isSingleRepoProject(myPushSupports);
@@ -125,10 +129,12 @@ public class PushController implements Disposable {
     Map<RepositoryNode, MyRepoModel> others = ContainerUtil.newLinkedHashMap();
     for (Map.Entry<RepositoryNode, MyRepoModel> entry : myView2Model.entrySet()) {
       MyRepoModel model = entry.getValue();
-      if (myPreselectedRepositories.contains(model.getRepository())) {
+      Repository repository = model.getRepository();
+      if (preselectByUser(repository)) {
         priorityLoading.put(entry.getKey(), model);
       }
-      else if (model.getSupport().shouldRequestIncomingChangesForNotCheckedRepositories()) {
+      else if (model.getSupport().shouldRequestIncomingChangesForNotCheckedRepositories() &&
+               !myExcludedRepositoryRoots.contains(repository.getRoot().getPath())) {
         others.put(entry.getKey(), model);
       }
     }
@@ -176,9 +182,6 @@ public class PushController implements Disposable {
     final RepositoryNode repoNode = mySingleRepoProject
                                     ? new SingleRepositoryNode(repoPanel, checkBoxModel)
                                     : new RepositoryNode(repoPanel, checkBoxModel, target != null);
-    if (!support.shouldRequestIncomingChangesForNotCheckedRepositories()) {
-      model.getCheckBoxModel().setChecked(myPreselectedRepositories.contains(repository));
-    }
     pushTargetPanel.setFireOnChangeAction(new Runnable() {
       @Override
       public void run() {
@@ -191,6 +194,7 @@ public class PushController implements Disposable {
       @Override
       public void onTargetChanged(T newTarget) {
         repoNode.setChecked(true);
+        myExcludedRepositoryRoots.remove(model.getRepository().getRoot().getPath());
         model.setTarget(newTarget);
         model.clearErrors();
         loadCommits(model, repoNode, false);
@@ -199,9 +203,14 @@ public class PushController implements Disposable {
       @Override
       public void onSelectionChanged(boolean isSelected) {
         myDialog.enableOkActions(isPushAllowed());
-        if (isSelected && !model.hasCommitInfo() && !model.getSupport().shouldRequestIncomingChangesForNotCheckedRepositories()) {
-          //download incoming if was not loaded before and marked as selected
-          loadCommits(model, repoNode, false);
+        if (isSelected) {
+          boolean forceLoad = myExcludedRepositoryRoots.remove(model.getRepository().getRoot().getPath());
+          if (!model.hasCommitInfo() && (forceLoad || !model.getSupport().shouldRequestIncomingChangesForNotCheckedRepositories())) {
+            loadCommits(model, repoNode, false);
+          }
+        }
+        else {
+          myExcludedRepositoryRoots.add(model.getRepository().getRoot().getPath());
         }
       }
     });
@@ -238,9 +247,54 @@ public class PushController implements Disposable {
 
   public boolean isPushAllowed() {
     JTree tree = myPushLog.getTree();
-    return !tree.isEditing() && !getSelectedRepoNode().isEmpty() && allNodesAreLoaded(myView2Model.keySet());
+    return !tree.isEditing() &&
+           ContainerUtil.exists(myPushSupports, new Condition<PushSupport<?, ?, ?>>() {
+             @Override
+             public boolean value(PushSupport<?, ?, ?> support) {
+               return isPushAllowed(support);
+             }
+           });
   }
 
+  private boolean isPushAllowed(@NotNull PushSupport<?, ?, ?> pushSupport) {
+    Collection<RepositoryNode> nodes = getNodesForSupport(pushSupport);
+    if (pushSupport.getRepositoryManager().isSyncEnabled()) {
+      return hasSomethingToPush(nodes) || (hasCheckedNode(nodes) && allNodesAreLoaded(nodes));
+    }
+    return hasSomethingToPush(nodes) || (hasCheckedNode(nodes));
+  }
+
+  private boolean hasSomethingToPush(Collection<RepositoryNode> nodes) {
+    return ContainerUtil.exists(nodes, new Condition<RepositoryNode>() {
+      @Override
+      public boolean value(@NotNull RepositoryNode node) {
+        PushTarget target = myView2Model.get(node).getTarget();
+        //if node is selected target should not be null
+        return (node.isChecked() || node.isLoading()) && target != null && target.hasSomethingToPush();
+      }
+    });
+  }
+
+  private static boolean hasCheckedNode(@NotNull Collection<RepositoryNode> nodes) {
+    return ContainerUtil.exists(nodes, new Condition<RepositoryNode>() {
+      @Override
+      public boolean value(@NotNull RepositoryNode node) {
+        return node.isChecked();
+      }
+    });
+  }
+
+  @NotNull
+  private Collection<RepositoryNode> getNodesForSupport(final PushSupport<?, ?, ?> support) {
+    return ContainerUtil.mapNotNull(myView2Model.entrySet(), new Function<Map.Entry<RepositoryNode, MyRepoModel>, RepositoryNode>() {
+      @Override
+      public RepositoryNode fun(Map.Entry<RepositoryNode, MyRepoModel> entry) {
+        return support.equals(entry.getValue().getSupport()) ? entry.getKey() : null;
+      }
+    });
+  }
+
+
   private static boolean allNodesAreLoaded(@NotNull Collection<RepositoryNode> nodes) {
     return !ContainerUtil.exists(nodes, new Condition<RepositoryNode>() {
       @Override
@@ -297,8 +351,8 @@ public class PushController implements Disposable {
             }
             else {
               List<? extends VcsFullCommitDetails> commits = outgoing.getCommits();
-              shouldBeSelected = shouldSelectInitially(target, repository, model.getSupport().getRepositoryManager(), !commits.isEmpty());
               model.setLoadedCommits(commits);
+              shouldBeSelected = shouldSelect(model);
               myPushLog.setChildren(node,
                                     getPresentationForCommits(PushController.this.myProject, model.getLoadedCommits(),
                                                               model.getNumberOfShownCommits()));
@@ -318,19 +372,24 @@ public class PushController implements Disposable {
     node.startLoading(myPushLog.getTree(), myExecutorService.submit(task, result));
   }
 
-  private boolean shouldSelectInitially(@NotNull PushTarget target, @NotNull Repository repository,
-                                        @NotNull RepositoryManager repositoryManager, boolean hasCommits) {
-    boolean shouldBeSelected;
-    if (mySingleRepoProject) {
-      shouldBeSelected = true;
-    }
-    else if (repositoryManager.isSyncEnabled()) {
-      shouldBeSelected = hasCommits || target.hasSomethingToPush();
-    }
-    else {
-      shouldBeSelected = (hasCommits || target.hasSomethingToPush());
-    }
-    return shouldBeSelected;
+  private boolean shouldSelect(@NotNull MyRepoModel model) {
+    if (mySingleRepoProject) return true;
+    Repository repository = model.getRepository();
+    return hasCommitsToPush(model) && (preselectByUser(repository) || notExcludedByUser(repository));
+  }
+
+  private boolean notExcludedByUser(@NotNull Repository repository) {
+    return !myExcludedRepositoryRoots.contains(repository.getRoot().getPath());
+  }
+
+  private boolean preselectByUser(@NotNull Repository repository) {
+    return myPreselectedRepositories.contains(repository);
+  }
+
+  private static boolean hasCommitsToPush(@NotNull MyRepoModel model) {
+    PushTarget target = model.getTarget();
+    assert target != null;
+    return (!model.getLoadedCommits().isEmpty() || target.hasSomethingToPush());
   }
 
   public PushLog getPushPanelLog() {
@@ -341,6 +400,7 @@ public class PushController implements Disposable {
     Task.Backgroundable task = new Task.Backgroundable(myProject, "Pushing...", false) {
       @Override
       public void run(@NotNull ProgressIndicator indicator) {
+        myExcludedSettings.saveExcludedRepoRoots(myExcludedRepositoryRoots);
         for (PushSupport support : myPushSupports) {
           doPush(support, force);
         }
diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java
index a86d9368e7d2..03fdca55c2c2 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.OptionAction;
+import com.intellij.openapi.ui.ValidationInfo;
 import net.miginfocom.swing.MigLayout;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -81,6 +82,18 @@ public class VcsPushDialog extends DialogWrapper {
     return ID;
   }
 
+  @Nullable
+  @Override
+  protected ValidationInfo doValidate() {
+    enableOkActions(myController.isPushAllowed());
+    return null;
+  }
+
+  @Override
+  protected boolean postponeValidation() {
+    return false;
+  }
+
   @Override
   @NotNull
   protected Action[] createActions() {
diff --git a/plugins/git4idea/src/git4idea/actions/GitPushAction.java b/plugins/git4idea/src/git4idea/actions/GitPushAction.java
index 04e139fa8934..8340de21c560 100644
--- a/plugins/git4idea/src/git4idea/actions/GitPushAction.java
+++ b/plugins/git4idea/src/git4idea/actions/GitPushAction.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.ContainerUtil;
 import git4idea.GitUtil;
-import git4idea.branch.GitBranchUtil;
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryManager;
 import org.jetbrains.annotations.NotNull;
@@ -38,15 +37,15 @@ public class GitPushAction extends DumbAwareAction {
   @Override
   public void actionPerformed(@NotNull AnActionEvent e) {
     Project project = e.getRequiredData(CommonDataKeys.PROJECT);
-    Collection<GitRepository> repositories = collectRepositories(project, e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY));
+    Collection<GitRepository> repositories = e.getData(CommonDataKeys.EDITOR) != null
+                                             ? ContainerUtil.<GitRepository>emptyList()
+                                             : collectRepositories(project, e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY));
     new VcsPushDialog(project, RepositoryUtil.sortRepositories(repositories)).show();
   }
 
   @NotNull
   private static Collection<GitRepository> collectRepositories(@NotNull Project project, @Nullable VirtualFile[] files) {
-    if (files == null) {
-      return Collections.singletonList(GitBranchUtil.getCurrentRepository(project));
-    }
+    if (files == null) return Collections.emptyList();
     GitRepositoryManager manager = GitUtil.getRepositoryManager(project);
     Collection<GitRepository> repositories = ContainerUtil.newHashSet();
     for (VirtualFile file : files) {
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgPushSupport.java b/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgPushSupport.java
index b05cde7fbd9f..e5539ef7c57e 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgPushSupport.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgPushSupport.java
@@ -15,14 +15,15 @@
  */
 package org.zmlx.hg4idea.push;
 
+import com.intellij.dvcs.branch.DvcsSyncSettings;
 import com.intellij.dvcs.push.*;
-import com.intellij.dvcs.repo.Repository;
 import com.intellij.dvcs.repo.RepositoryManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.AbstractVcs;
 import com.intellij.util.ObjectUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.zmlx.hg4idea.HgProjectSettings;
 import org.zmlx.hg4idea.HgVcs;
 import org.zmlx.hg4idea.repo.HgRepository;
 import org.zmlx.hg4idea.util.HgUtil;
@@ -31,10 +32,12 @@ public class HgPushSupport extends PushSupport<HgRepository, HgPushSource, HgTar
 
   @NotNull private final Project myProject;
   @NotNull private final HgVcs myVcs;
+  @NotNull private final HgProjectSettings mySettings;
 
   public HgPushSupport(@NotNull Project project) {
     myProject = project;
     myVcs = ObjectUtils.assertNotNull(HgVcs.getInstance(myProject));
+    mySettings = myVcs.getProjectSettings();
   }
 
   @NotNull
@@ -98,6 +101,7 @@ public class HgPushSupport extends PushSupport<HgRepository, HgPushSource, HgTar
 
   @Override
   public boolean shouldRequestIncomingChangesForNotCheckedRepositories() {
-    return false;
+    // load commit for all repositories if sync
+    return mySettings.getSyncSetting() == DvcsSyncSettings.Value.SYNC;
   }
 }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTarget.java b/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTarget.java
index 2e46fb964ed6..cfc9ad9db9f5 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTarget.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTarget.java
@@ -33,7 +33,7 @@ public class HgTarget implements PushTarget {
 
   @Override
   public boolean hasSomethingToPush() {
-    return false;
+    // push is always allowed except invalid target
+    return true;
   }
-
 }

From 325dde5793aa0ccbbd7051189140a89ef45c512c Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Sun, 26 Oct 2014 22:18:09 +0300
Subject: [PATCH 052/132] IDEABKL-6086 Distraction Free mode

---
 .../ToggleDistractionFreeModeAction.java      | 67 ++++++++++++++++++-
 .../actions/TogglePresentationModeAction.java |  4 +-
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ToggleDistractionFreeModeAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ToggleDistractionFreeModeAction.java
index 4afd28d9f893..196d36ea5a6b 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ToggleDistractionFreeModeAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ToggleDistractionFreeModeAction.java
@@ -15,18 +15,33 @@
  */
 package com.intellij.ide.actions;
 
+import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
+import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings;
+import com.intellij.ide.ui.LafManager;
+import com.intellij.ide.ui.UISettings;
+import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.editor.EditorFactory;
+import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
+import com.intellij.openapi.editor.ex.util.EditorUtil;
 import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.registry.RegistryValue;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+
 public class ToggleDistractionFreeModeAction extends AnAction implements DumbAware {
   private static final String key = "editor.distraction.free.mode";
+
   @Override
   public void update(@NotNull AnActionEvent e) {
+    if (e.getProject() == null) {
+      e.getPresentation().setEnabled(false);
+      return;
+    }
     RegistryValue value = Registry.get(key);
     boolean selected = value.asBoolean();
     e.getPresentation().setText((selected ? "Exit" : "Enter") + " Distraction Free Mode");
@@ -34,8 +49,58 @@ public class ToggleDistractionFreeModeAction extends AnAction implements DumbAwa
 
   @Override
   public void actionPerformed(@NotNull AnActionEvent e) {
+    Project project = e.getProject();
     RegistryValue value = Registry.get(key);
-    value.setValue(!value.asBoolean());
+    boolean v = !value.asBoolean();
+    value.setValue(v);
+
+    if (project == null) return;
+
+    PropertiesComponent p = PropertiesComponent.getInstance(project);
+    UISettings ui = UISettings.getInstance();
+    EditorSettingsExternalizable.OptionSet eo = EditorSettingsExternalizable.getInstance().getOptions();
+    DaemonCodeAnalyzerSettings ds = DaemonCodeAnalyzerSettings.getInstance();
+
+    String before = "BEFORE.DISTRACTION.MODE.";
+    if (v) {
+      p.setValue(before + "SHOW_STATUS_BAR", String.valueOf(ui.SHOW_STATUS_BAR)); ui.SHOW_STATUS_BAR = false; 
+      p.setValue(before + "SHOW_MAIN_TOOLBAR", String.valueOf(ui.SHOW_MAIN_TOOLBAR)); ui.SHOW_MAIN_TOOLBAR = false; 
+      p.setValue(before + "SHOW_NAVIGATION_BAR", String.valueOf(ui.SHOW_NAVIGATION_BAR)); ui.SHOW_NAVIGATION_BAR = false; 
+      p.setValue(before + "HIDE_TOOL_STRIPES", String.valueOf(ui.HIDE_TOOL_STRIPES)); ui.HIDE_TOOL_STRIPES = true;
+      p.setValue(before + "EDITOR_TAB_PLACEMENT", String.valueOf(ui.EDITOR_TAB_PLACEMENT)); ui.EDITOR_TAB_PLACEMENT = UISettings.TABS_NONE;
+
+      p.setValue(before + "IS_FOLDING_OUTLINE_SHOWN", String.valueOf(eo.IS_FOLDING_OUTLINE_SHOWN)); eo.IS_FOLDING_OUTLINE_SHOWN = false; 
+      p.setValue(before + "IS_WHITESPACES_SHOWN", String.valueOf(eo.IS_WHITESPACES_SHOWN)); eo.IS_WHITESPACES_SHOWN = false; 
+      p.setValue(before + "ARE_LINE_NUMBERS_SHOWN", String.valueOf(eo.ARE_LINE_NUMBERS_SHOWN)); eo.ARE_LINE_NUMBERS_SHOWN = false; 
+      //p.setValue(before + "IS_RIGHT_MARGIN_SHOWN", String.valueOf(eo.IS_RIGHT_MARGIN_SHOWN)); eo.IS_RIGHT_MARGIN_SHOWN = false; 
+      p.setValue(before + "IS_INDENT_GUIDES_SHOWN", String.valueOf(eo.IS_INDENT_GUIDES_SHOWN)); eo.IS_INDENT_GUIDES_SHOWN = false; 
+      
+      p.setValue(before + "SHOW_METHOD_SEPARATORS", String.valueOf(ds.SHOW_METHOD_SEPARATORS)); ds.SHOW_METHOD_SEPARATORS = false; 
+      
+      TogglePresentationModeAction.storeToolWindows(project);
+    }
+    else {
+      ui.SHOW_STATUS_BAR = p.getBoolean(before + "SHOW_STATUS_BAR", true);
+      ui.SHOW_MAIN_TOOLBAR = p.getBoolean(before + "SHOW_MAIN_TOOLBAR", true);
+      ui.SHOW_NAVIGATION_BAR = p.getBoolean(before + "SHOW_NAVIGATION_BAR", true);
+      ui.HIDE_TOOL_STRIPES = p.getBoolean(before + "HIDE_TOOL_STRIPES", true);
+      ui.EDITOR_TAB_PLACEMENT = p.getOrInitInt(before + "EDITOR_TAB_PLACEMENT", SwingConstants.TOP);
+
+      eo.IS_FOLDING_OUTLINE_SHOWN = p.getBoolean(before + "IS_FOLDING_OUTLINE_SHOWN", true);
+      eo.IS_WHITESPACES_SHOWN = p.getBoolean(before + "IS_WHITESPACES_SHOWN", false);
+      eo.ARE_LINE_NUMBERS_SHOWN = p.getBoolean(before + "ARE_LINE_NUMBERS_SHOWN", false);
+      //eo.IS_RIGHT_MARGIN_SHOWN = p.getBoolean(before + "IS_RIGHT_MARGIN_SHOWN", true);
+      eo.IS_INDENT_GUIDES_SHOWN = p.getBoolean(before + "IS_INDENT_GUIDES_SHOWN", false);
+      
+      ds.SHOW_METHOD_SEPARATORS = p.getBoolean(before + "SHOW_METHOD_SEPARATORS", false);
+
+      TogglePresentationModeAction.restoreToolWindows(project, true, false);
+    }
+
+    UISettings.getInstance().fireUISettingsChanged();
+    LafManager.getInstance().updateUI();
+    EditorUtil.reinitSettings();
+    DaemonCodeAnalyzer.getInstance(project).settingsChanged();
     EditorFactory.getInstance().refreshAllEditors();
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/TogglePresentationModeAction.java b/platform/platform-impl/src/com/intellij/ide/actions/TogglePresentationModeAction.java
index 78b84652563c..16dae889b101 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/TogglePresentationModeAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/TogglePresentationModeAction.java
@@ -180,7 +180,7 @@ public class TogglePresentationModeAction extends AnAction implements DumbAware
     return hasVisible;
   }
 
-  private static boolean storeToolWindows(@Nullable Project project) {
+  static boolean storeToolWindows(@Nullable Project project) {
     if (project == null) return false;
     ToolWindowManagerEx manager = ToolWindowManagerEx.getInstanceEx(project);
 
@@ -195,7 +195,7 @@ public class TogglePresentationModeAction extends AnAction implements DumbAware
     return hasVisible;
   }
 
-  private static void restoreToolWindows(Project project, boolean needsRestore, boolean inPresentation) {
+  static void restoreToolWindows(Project project, boolean needsRestore, boolean inPresentation) {
     if (project == null || !needsRestore) return;
     ToolWindowManagerEx manager = ToolWindowManagerEx.getInstanceEx(project);
     DesktopLayout restoreLayout = manager.getLayoutToRestoreLater();

From 06d844e145413f523cccf7f53fa71c78b0ab6f3c Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Sun, 26 Oct 2014 20:20:31 +0100
Subject: [PATCH 053/132] catch AbstractMethodError for old api clients

---
 .../src/org/intellij/lang/regexp/RegExpLanguageHosts.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java
index ec2b9192c2d5..c1cff8aff61e 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java
@@ -79,7 +79,12 @@ public final class RegExpLanguageHosts extends ClassExtension<RegExpLanguageHost
       return true;
     }
     final RegExpLanguageHost host = findRegExpHost(regExpChar);
-    return host != null && host.supportsExtendedHexCharacter(regExpChar);
+    try {
+      return host != null && host.supportsExtendedHexCharacter(regExpChar);
+    } catch (AbstractMethodError e) {
+      // supportsExtendedHexCharacter not present
+      return false;
+    }
   }
 
   public boolean supportsNamedGroupSyntax(@Nullable final RegExpGroup group) {

From 7567c0fda36e57490ceaa4890e52fc61078d1804 Mon Sep 17 00:00:00 2001
From: "liana.bakradze" <liana.bakradze@jetbrains.com>
Date: Sun, 26 Oct 2014 23:02:56 +0300
Subject: [PATCH 054/132] fixed EDU-233, switched to flat model in offset
 listener

---
 .../coursecreator/CCDocumentListener.java     | 89 +++++++++++++------
 .../CCEditorFactoryListener.java              |  6 --
 .../actions/CCAddTaskWindow.java              |  1 +
 .../actions/CCCreateCourseArchive.java        | 10 +--
 .../coursecreator/format/TaskFile.java        | 58 +++---------
 .../coursecreator/format/TaskWindow.java      |  9 +-
 .../python/edu/StudyDocumentListener.java     | 72 ++++++++++-----
 .../jetbrains/python/edu/course/TaskFile.java | 44 ---------
 8 files changed, 132 insertions(+), 157 deletions(-)

diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCDocumentListener.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCDocumentListener.java
index 3573216e9efa..b1917292df32 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCDocumentListener.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCDocumentListener.java
@@ -1,24 +1,23 @@
 package org.jetbrains.plugins.coursecreator;
 
 import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.editor.event.DocumentAdapter;
 import com.intellij.openapi.editor.event.DocumentEvent;
 import com.intellij.openapi.editor.impl.event.DocumentEventImpl;
 import org.jetbrains.plugins.coursecreator.format.TaskFile;
 import org.jetbrains.plugins.coursecreator.format.TaskWindow;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * author: liana
- * data: 7/16/14.
  * Listens changes in study files and updates
  * coordinates of all the windows in current task file
  */
 public abstract class CCDocumentListener extends DocumentAdapter {
   private final TaskFile myTaskFile;
-  private int myOldLine;
-  private int myOldLineStartOffset;
-  private TaskWindow myTaskWindow;
+  private List<TaskWindowWrapper> myTaskWindows = new ArrayList<TaskWindowWrapper>();
+
 
   public CCDocumentListener(TaskFile taskFile) {
     myTaskFile = taskFile;
@@ -29,39 +28,71 @@ public abstract class CCDocumentListener extends DocumentAdapter {
   // with fragments containing "\n"
   @Override
   public void beforeDocumentChange(DocumentEvent e) {
-    int offset = e.getOffset();
-    int oldEnd = offset + e.getOldLength();
     Document document = e.getDocument();
-    myOldLine = document.getLineNumber(oldEnd);
-    myOldLineStartOffset = document.getLineStartOffset(myOldLine);
-    int line = document.getLineNumber(offset);
-    int offsetInLine = offset - document.getLineStartOffset(line);
-    LogicalPosition pos = new LogicalPosition(line, offsetInLine);
-    myTaskWindow = myTaskFile.getTaskWindow(document, pos);
+    myTaskWindows.clear();
+    for (TaskWindow taskWindow : myTaskFile.getTaskWindows()) {
+      int twStart = taskWindow.getRealStartOffset(document);
+      int length = useLength() ? taskWindow.getLength() : taskWindow.getReplacementLength();
+      int twEnd = twStart + length;
+      myTaskWindows.add(new TaskWindowWrapper(taskWindow, twStart, twEnd));
+    }
   }
 
   @Override
   public void documentChanged(DocumentEvent e) {
     if (e instanceof DocumentEventImpl) {
-        DocumentEventImpl event = (DocumentEventImpl)e;
-        Document document = e.getDocument();
-        int offset = e.getOffset();
-        int change = event.getNewLength() - event.getOldLength();
-        if (myTaskWindow != null) {
-          updateTaskWindowLength(e.getNewFragment(), myTaskWindow, change);
+      DocumentEventImpl event = (DocumentEventImpl)e;
+      Document document = e.getDocument();
+      int offset = e.getOffset();
+      int change = event.getNewLength() - event.getOldLength();
+      for (TaskWindowWrapper taskWindowWrapper : myTaskWindows) {
+        int twStart = taskWindowWrapper.getTwStart();
+        if (twStart > offset) {
+          twStart += change;
+        }
+        int twEnd = taskWindowWrapper.getTwEnd();
+        if (twEnd >= offset) {
+          twEnd += change;
+        }
+        TaskWindow taskWindow = taskWindowWrapper.getTaskWindow();
+        int line = document.getLineNumber(twStart);
+        int start = twStart - document.getLineStartOffset(line);
+        int length = twEnd - twStart;
+        taskWindow.setLine(line);
+        taskWindow.setStart(start);
+        if (useLength()) {
+          taskWindow.setLength(length);
+        } else {
+          taskWindow.setReplacementLength(length);
         }
-        int newEnd = offset + event.getNewLength();
-        int newLine = document.getLineNumber(newEnd);
-        int lineChange = newLine - myOldLine;
-        myTaskFile.incrementLines(myOldLine + 1, lineChange);
-        int newEndOffsetInLine = offset + e.getNewLength() - document.getLineStartOffset(newLine);
-        int oldEndOffsetInLine = offset + e.getOldLength() - myOldLineStartOffset;
-        myTaskFile.updateLine(lineChange, myOldLine, newEndOffsetInLine, oldEndOffsetInLine, useLength());
       }
+    }
   }
 
-  protected abstract void updateTaskWindowLength(CharSequence fragment, TaskWindow taskWindow, int change);
-
   protected abstract  boolean useLength();
+
+  private static class TaskWindowWrapper {
+    public TaskWindow myTaskWindow;
+    public int myTwStart;
+    public int myTwEnd;
+
+    public TaskWindowWrapper(TaskWindow taskWindow, int twStart, int twEnd) {
+      myTaskWindow = taskWindow;
+      myTwStart = twStart;
+      myTwEnd = twEnd;
+    }
+
+    public int getTwStart() {
+      return myTwStart;
+    }
+
+    public int getTwEnd() {
+      return myTwEnd;
+    }
+
+    public TaskWindow getTaskWindow() {
+      return myTaskWindow;
+    }
+  }
 }
 
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCEditorFactoryListener.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCEditorFactoryListener.java
index 74afc795b60a..24688c4b2709 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCEditorFactoryListener.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCEditorFactoryListener.java
@@ -72,12 +72,6 @@ public class CCEditorFactoryListener implements EditorFactoryListener {
       super(taskFile);
     }
 
-    @Override
-    protected void updateTaskWindowLength(CharSequence fragment, TaskWindow taskWindow, int change) {
-        int newLength = taskWindow.getReplacementLength() + change;
-        taskWindow.setReplacementLength(newLength <= 0 ? 0 : newLength);
-    }
-
     @Override
     protected boolean useLength() {
       return false;
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java
index 951a5e85582b..e423da553d1b 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java
@@ -85,6 +85,7 @@ public class CCAddTaskWindow extends DumbAwareAction {
     }
     int index = taskFile.getTaskWindows().size() + 1;
     taskFile.addTaskWindow(taskWindow, index);
+    taskFile.sortTaskWindows();
     taskWindow.drawHighlighter(editor, false);
     taskWindow.createGuardedBlocks(editor);
   }
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateCourseArchive.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateCourseArchive.java
index c201e4ddaee4..b5a0292db684 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateCourseArchive.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateCourseArchive.java
@@ -134,6 +134,9 @@ public class CCCreateCourseArchive extends DumbAwareAction {
     final TaskFile taskFile = taskFiles.getValue();
     TaskFile taskFileSaved = new TaskFile();
     taskFile.copy(taskFileSaved);
+    for (TaskWindow taskWindow : taskFile.getTaskWindows()) {
+      taskWindow.setLength(taskWindow.getReplacementLength());
+    }
     CommandProcessor.getInstance().executeCommand(project, new Runnable() {
       @Override
       public void run() {
@@ -168,7 +171,7 @@ public class CCCreateCourseArchive extends DumbAwareAction {
         ApplicationManager.getApplication().runWriteAction(new Runnable() {
           @Override
           public void run() {
-            document.replaceString(offset, offset + taskWindow.getReplacementLength(), taskText);
+            document.replaceString(offset, offset + taskWindow.getLength(), taskText);
             FileDocumentManager.getInstance().saveDocument(document);
           }
         });
@@ -254,11 +257,6 @@ public class CCCreateCourseArchive extends DumbAwareAction {
       super(taskFile);
     }
 
-    @Override
-    protected void updateTaskWindowLength(CharSequence fragment, TaskWindow taskWindow, int change) {
-      //we don't need to update task window length
-    }
-
     @Override
     protected boolean useLength() {
       return true;
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskFile.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskFile.java
index c48a4f41d7e1..9fb10eaa179a 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskFile.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskFile.java
@@ -6,9 +6,9 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.LogicalPosition;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.plugins.coursecreator.CCProjectService;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class TaskFile {
@@ -57,52 +57,6 @@ public class TaskFile {
     return null;
   }
 
-  /**
-   * Updates task window lines
-   *
-   * @param startLine lines greater than this line and including this line will be updated
-   * @param change    change to be added to line numbers
-   */
-  public void incrementLines(int startLine, int change) {
-    for (TaskWindow taskTaskWindow : task_windows) {
-      if (taskTaskWindow.getLine() >= startLine) {
-        taskTaskWindow.setLine(taskTaskWindow.getLine() + change);
-      }
-    }
-  }
-
-  /**
-   * Updates windows in specific line
-   *
-   * @param lineChange         change in line number
-   * @param line               line to be updated
-   * @param newEndOffsetInLine distance from line start to end of inserted fragment
-   * @param oldEndOffsetInLine distance from line start to end of changed fragment
-   */
-  public void updateLine(int lineChange, int line, int newEndOffsetInLine, int oldEndOffsetInLine, boolean useLength) {
-    for (TaskWindow w : task_windows) {
-      if ((w.getLine() == line) && (w.getStart() > oldEndOffsetInLine)) {
-        int distance = w.getStart() - oldEndOffsetInLine;
-        boolean coveredByPrevTW = false;
-        int prevIndex = w.getIndex() - 1;
-        if (CCProjectService.indexIsValid(prevIndex, task_windows)) {
-          TaskWindow prevTW = task_windows.get(prevIndex - 1);
-          if (prevTW.getLine() == line) {
-            int prevLength = useLength ? prevTW.getLength() : prevTW.getReplacementLength();
-            int endOffset = prevTW.getStart() + prevLength;
-            if (endOffset >= newEndOffsetInLine) {
-              coveredByPrevTW = true;
-            }
-          }
-        }
-        if (lineChange != 0 || newEndOffsetInLine <= w.getStart() || coveredByPrevTW) {
-          w.setStart(distance + newEndOffsetInLine);
-          w.setLine(line + lineChange);
-        }
-      }
-    }
-  }
-
   public void copy(@NotNull final TaskFile target) {
     target.setIndex(myIndex);
     for (TaskWindow taskWindow : task_windows) {
@@ -110,6 +64,7 @@ public class TaskFile {
                                               taskWindow.getLength(), "");
       target.getTaskWindows().add(savedWindow);
       savedWindow.setIndex(taskWindow.getIndex());
+      savedWindow.setReplacementLength(taskWindow.getReplacementLength());
     }
   }
 
@@ -121,6 +76,8 @@ public class TaskFile {
       }
       taskWindowUpdated.setLine(taskWindow.getLine());
       taskWindowUpdated.setStart(taskWindow.getStart());
+      taskWindowUpdated.setReplacementLength(taskWindow.getReplacementLength());
+      taskWindowUpdated.setLength(taskWindow.getLength());
     }
   }
 
@@ -142,4 +99,11 @@ public class TaskFile {
       taskWindow.createGuardedBlocks(editor);
     }
   }
+
+  public void sortTaskWindows() {
+    Collections.sort(task_windows);
+    for (int i = 0; i < task_windows.size(); i++) {
+      task_windows.get(i).setIndex(i + 1);
+    }
+  }
 }
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskWindow.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskWindow.java
index dc7551929e30..385aaeddf26e 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskWindow.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskWindow.java
@@ -20,7 +20,7 @@ import org.jetbrains.plugins.coursecreator.CCProjectService;
 import java.io.File;
 import java.util.List;
 
-public class TaskWindow implements Comparable{
+public class TaskWindow implements Comparable<TaskWindow> {
 
   @Expose public int line;
   @Expose public int start;
@@ -120,8 +120,7 @@ public class TaskWindow implements Comparable{
   }
 
   @Override
-  public int compareTo(Object o) {
-    TaskWindow taskWindow = (TaskWindow)o;
+  public int compareTo(@NotNull TaskWindow taskWindow) {
     int lineDiff = line - taskWindow.line;
     if (lineDiff == 0) {
       return start - taskWindow.start;
@@ -154,4 +153,8 @@ public class TaskWindow implements Comparable{
       .addRangeHighlighter(start, end, HighlighterLayer.LAST + 1, null, HighlighterTargetArea.EXACT_RANGE);
     blocks.add(rh);
   }
+
+  public void setLength(int length) {
+    this.length = length;
+  }
 }
\ No newline at end of file
diff --git a/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDocumentListener.java b/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDocumentListener.java
index 8955032aa408..848becfae1b1 100644
--- a/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDocumentListener.java
+++ b/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDocumentListener.java
@@ -2,22 +2,22 @@ package com.jetbrains.python.edu;
 
 
 import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.editor.event.DocumentAdapter;
 import com.intellij.openapi.editor.event.DocumentEvent;
 import com.intellij.openapi.editor.impl.event.DocumentEventImpl;
 import com.jetbrains.python.edu.course.TaskFile;
 import com.jetbrains.python.edu.course.TaskWindow;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Listens changes in study files and updates
  * coordinates of all the windows in current task file
  */
 public class StudyDocumentListener extends DocumentAdapter {
   private final TaskFile myTaskFile;
-  private int myOldLine;
-  private int myOldLineStartOffset;
-  private TaskWindow myTaskWindow;
+  private List<TaskWindowWrapper> myTaskWindows = new ArrayList<TaskWindowWrapper>();
 
   public StudyDocumentListener(TaskFile taskFile) {
     myTaskFile = taskFile;
@@ -28,15 +28,13 @@ public class StudyDocumentListener extends DocumentAdapter {
   // with fragments containing "\n"
   @Override
   public void beforeDocumentChange(DocumentEvent e) {
-    int offset = e.getOffset();
-    int oldEnd = offset + e.getOldLength();
     Document document = e.getDocument();
-    myOldLine = document.getLineNumber(oldEnd);
-    myOldLineStartOffset = document.getLineStartOffset(myOldLine);
-    int line = document.getLineNumber(offset);
-    int offsetInLine = offset - document.getLineStartOffset(line);
-    LogicalPosition pos = new LogicalPosition(line, offsetInLine);
-    myTaskWindow = myTaskFile.getTaskWindow(document, pos);
+    myTaskWindows.clear();
+    for (TaskWindow taskWindow : myTaskFile.getTaskWindows()) {
+      int twStart = taskWindow.getRealStartOffset(document);
+      int twEnd = twStart + taskWindow.getLength();
+      myTaskWindows.add(new TaskWindowWrapper(taskWindow, twStart, twEnd));
+    }
   }
 
   @Override
@@ -46,17 +44,47 @@ public class StudyDocumentListener extends DocumentAdapter {
       Document document = e.getDocument();
       int offset = e.getOffset();
       int change = event.getNewLength() - event.getOldLength();
-      if (myTaskWindow != null) {
-        int newLength = myTaskWindow.getLength() + change;
-        myTaskWindow.setLength(newLength <= 0 ? 0 : newLength);
+      for (TaskWindowWrapper taskWindowWrapper : myTaskWindows) {
+        int twStart = taskWindowWrapper.getTwStart();
+        if (twStart > offset) {
+          twStart += change;
+        }
+        int twEnd = taskWindowWrapper.getTwEnd();
+        if (twEnd >= offset) {
+          twEnd += change;
+        }
+        TaskWindow taskWindow = taskWindowWrapper.getTaskWindow();
+        int line = document.getLineNumber(twStart);
+        int start = twStart - document.getLineStartOffset(line);
+        int length = twEnd - twStart;
+        taskWindow.setLine(line);
+        taskWindow.setStart(start);
+        taskWindow.setLength(length);
       }
-      int newEnd = offset + event.getNewLength();
-      int newLine = document.getLineNumber(newEnd);
-      int lineChange = newLine - myOldLine;
-      myTaskFile.incrementLines(myOldLine + 1, lineChange);
-      int newEndOffsetInLine = offset + e.getNewLength() - document.getLineStartOffset(newLine);
-      int oldEndOffsetInLine = offset + e.getOldLength() - myOldLineStartOffset;
-      myTaskFile.updateLine(lineChange, myOldLine, newEndOffsetInLine, oldEndOffsetInLine);
+    }
+  }
+
+  private static class TaskWindowWrapper {
+    public TaskWindow myTaskWindow;
+    public int myTwStart;
+    public int myTwEnd;
+
+    public TaskWindowWrapper(TaskWindow taskWindow, int twStart, int twEnd) {
+      myTaskWindow = taskWindow;
+      myTwStart = twStart;
+      myTwEnd = twEnd;
+    }
+
+    public int getTwStart() {
+      return myTwStart;
+    }
+
+    public int getTwEnd() {
+      return myTwEnd;
+    }
+
+    public TaskWindow getTaskWindow() {
+      return myTaskWindow;
     }
   }
 }
diff --git a/python/edu/learn-python/src/com/jetbrains/python/edu/course/TaskFile.java b/python/edu/learn-python/src/com/jetbrains/python/edu/course/TaskFile.java
index aaaef375a093..e9281e957855 100644
--- a/python/edu/learn-python/src/com/jetbrains/python/edu/course/TaskFile.java
+++ b/python/edu/learn-python/src/com/jetbrains/python/edu/course/TaskFile.java
@@ -127,20 +127,6 @@ public class TaskFile implements Stateful {
     return null;
   }
 
-  /**
-   * Updates task window lines
-   *
-   * @param startLine lines greater than this line and including this line will be updated
-   * @param change    change to be added to line numbers
-   */
-  public void incrementLines(int startLine, int change) {
-    for (TaskWindow taskTaskWindow : taskWindows) {
-      if (taskTaskWindow.getLine() >= startLine) {
-        taskTaskWindow.setLine(taskTaskWindow.getLine() + change);
-      }
-    }
-  }
-
   /**
    * Initializes state of task file
    *
@@ -165,36 +151,6 @@ public class TaskFile implements Stateful {
     myIndex = index;
   }
 
-  /**
-   * Updates windows in specific line
-   *
-   * @param lineChange         change in line number
-   * @param line               line to be updated
-   * @param newEndOffsetInLine distance from line start to end of inserted fragment
-   * @param oldEndOffsetInLine distance from line start to end of changed fragment
-   */
-  public void updateLine(int lineChange, int line, int newEndOffsetInLine, int oldEndOffsetInLine) {
-    for (TaskWindow w : taskWindows) {
-      if ((w.getLine() == line) && (w.getStart() > oldEndOffsetInLine)) {
-        int distance = w.getStart() - oldEndOffsetInLine;
-        boolean coveredByPrevTW = false;
-        int prevIndex = w.getIndex() - 1;
-        if (StudyUtils.indexIsValid(prevIndex, taskWindows)) {
-          TaskWindow prevTW = taskWindows.get(prevIndex);
-          if (prevTW.getLine() == line) {
-            int endOffset = prevTW.getStart() + prevTW.getLength();
-            if (endOffset >= newEndOffsetInLine) {
-              coveredByPrevTW = true;
-            }
-          }
-        }
-        if (lineChange != 0 || newEndOffsetInLine <= w.getStart() || coveredByPrevTW) {
-          w.setStart(distance + newEndOffsetInLine);
-          w.setLine(line + lineChange);
-        }
-      }
-    }
-  }
 
   public static void copy(@NotNull final TaskFile source, @NotNull final TaskFile target) {
     List<TaskWindow> sourceTaskWindows = source.getTaskWindows();

From f56e798a5d8a66cae2efbbfdccb33ffa5b8493c8 Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Mon, 27 Oct 2014 00:59:31 +0400
Subject: [PATCH 055/132] load all roots for git and for sync hg

---
 .../dvcs-impl/src/com/intellij/dvcs/push/PushController.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
index 7ddeb138425f..e4a8c1a64826 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
@@ -133,8 +133,7 @@ public class PushController implements Disposable {
       if (preselectByUser(repository)) {
         priorityLoading.put(entry.getKey(), model);
       }
-      else if (model.getSupport().shouldRequestIncomingChangesForNotCheckedRepositories() &&
-               !myExcludedRepositoryRoots.contains(repository.getRoot().getPath())) {
+      else if (model.getSupport().shouldRequestIncomingChangesForNotCheckedRepositories()) {
         others.put(entry.getKey(), model);
       }
     }

From cc6cd053dfbfca30bfa452dd0b173c143c0b5190 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Sat, 25 Oct 2014 17:12:32 +0200
Subject: [PATCH 056/132] don't evaluate arrays on EDT when debugging remotely

(cherry picked from commit ed2a20feeec3dad31e25d5e027940cf85f2b065f)
---
 .../impl/evaluate/XDebuggerEditorLinePainter.java    |  2 +-
 .../xdebugger/impl/ui/tree/XDebuggerTree.java        | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEditorLinePainter.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEditorLinePainter.java
index 1f8d636d1fab..cce3eac58098 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEditorLinePainter.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEditorLinePainter.java
@@ -79,7 +79,7 @@ public class XDebuggerEditorLinePainter extends EditorLinePainter {
         final XValuePresentation presentation = value.getValuePresentation();
         if (presentation == null) continue;
         try {
-          if (presentation instanceof XValueCompactPresentation) {
+          if (presentation instanceof XValueCompactPresentation && !value.getTree().isUnderRemoteDebug()) {
             ((XValueCompactPresentation)presentation).renderValue(renderer, value);
           }
           else {
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
index 91de065a12d8..feb62d3c03df 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
@@ -15,6 +15,9 @@
  */
 package com.intellij.xdebugger.impl.ui.tree;
 
+import com.intellij.execution.configurations.RemoteRunProfile;
+import com.intellij.execution.runners.ExecutionEnvironment;
+import com.intellij.ide.DataManager;
 import com.intellij.ide.dnd.aware.DnDAwareTree;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
@@ -226,6 +229,15 @@ public class XDebuggerTree extends DnDAwareTree implements DataProvider, Disposa
   private void updateEditor() {
     myAlarm.cancelAndRequest();
   }
+  
+  public boolean isUnderRemoteDebug() {
+    DataContext context = DataManager.getInstance().getDataContext(this);
+    ExecutionEnvironment env = LangDataKeys.EXECUTION_ENVIRONMENT.getData(context);
+    if (env != null && env.getRunProfile() instanceof RemoteRunProfile) {
+      return true;
+    }
+    return false;
+  }
 
   private boolean expandIfEllipsis() {
     MessageTreeNode[] treeNodes = getSelectedNodes(MessageTreeNode.class, null);

From b68fe530c1b09e231ce4546697dd06a50d5aef14 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Sat, 25 Oct 2014 17:16:54 +0200
Subject: [PATCH 057/132] remove code duplicate (use isUnderRemoteDebug
 directly)

(cherry picked from commit 43b8a662654406422ad01743841324736c5d7214)
---
 .../impl/ui/tree/nodes/XValueContainerNode.java          | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java
index 2f9d60d11785..6c175f52d6a6 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java
@@ -15,12 +15,9 @@
  */
 package com.intellij.xdebugger.impl.ui.tree.nodes;
 
-import com.intellij.execution.configurations.RemoteRunProfile;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.configurations.RunProfile;
-import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.ide.DataManager;
-import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.ui.SimpleTextAttributes;
@@ -121,13 +118,11 @@ public abstract class XValueContainerNode<ValueContainer extends XValueContainer
   }
 
   private static boolean isUseGetChildrenHack(@NotNull XDebuggerTree tree) {
-    DataContext context = DataManager.getInstance().getDataContext(tree);
-    ExecutionEnvironment env = LangDataKeys.EXECUTION_ENVIRONMENT.getData(context);
-    if (env != null && env.getRunProfile() instanceof RemoteRunProfile) {
+    if (tree.isUnderRemoteDebug()) {
       return false;
     }
 
-    RunProfile runProfile = LangDataKeys.RUN_PROFILE.getData(context);
+    RunProfile runProfile = LangDataKeys.RUN_PROFILE.getData(DataManager.getInstance().getDataContext(tree));
     return !(runProfile instanceof RunConfiguration && ((RunConfiguration)runProfile).getType().getDisplayName().startsWith("JavaScript"));
   }
 

From 728347639777fba10d186dc6c69a6d83d00c9c7d Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Mon, 27 Oct 2014 08:44:36 +0100
Subject: [PATCH 058/132] Platform: extensible welcome wizard: * themes page
 can be customized * additionas UI setting supported

---
 .../com/intellij/ide/WelcomeWizardUtil.java   |  83 ++++++++++++
 .../src/com/intellij/ide/ui/UISettings.java   |   4 +
 .../CustomizeKeyboardSchemeStepPanel.java     |   6 +-
 .../customize/CustomizeUIThemeStepPanel.java  | 121 ++++++++++--------
 .../intellij/ide/customize/PluginGroups.java  |   4 +-
 .../intellij/ide/ui/laf/LafManagerImpl.java   |  10 +-
 .../src/com/intellij/idea/StartupUtil.java    |  41 +-----
 .../colors/impl/EditorColorsManagerImpl.java  |  10 +-
 .../openapi/keymap/impl/DefaultKeymap.java    |   3 +-
 .../keymap/impl/KeymapManagerImpl.java        |   5 +-
 10 files changed, 182 insertions(+), 105 deletions(-)
 create mode 100644 platform/core-api/src/com/intellij/ide/WelcomeWizardUtil.java

diff --git a/platform/core-api/src/com/intellij/ide/WelcomeWizardUtil.java b/platform/core-api/src/com/intellij/ide/WelcomeWizardUtil.java
new file mode 100644
index 000000000000..dabb6ac530ea
--- /dev/null
+++ b/platform/core-api/src/com/intellij/ide/WelcomeWizardUtil.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.ide;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+public class WelcomeWizardUtil {
+  private static volatile String ourDefaultLAF;
+  private static volatile String ourWizardLAF;
+  private static volatile String ourWizardMacKeymap;
+  private static volatile String ourWizardEditorScheme;
+  private static volatile Boolean ourAutoScrollToSource;
+  private static volatile Set<String> ourFeaturedPluginsToInstall = new HashSet<String>();
+
+  public static void setDefaultLAF(String laf) {
+    ourDefaultLAF = laf;
+  }
+
+  public static String getDefaultLAF() {
+    return ourDefaultLAF;
+  }
+
+  public static void setWizardLAF(String laf) {
+    ourWizardLAF = laf;
+  }
+
+  public static String getWizardLAF() {
+    return ourWizardLAF;
+  }
+
+  public static void setWizardKeymap(@Nullable String keymap) {
+    ourWizardMacKeymap = keymap;
+  }
+
+  @Nullable
+  public static String getWizardMacKeymap() {
+    return ourWizardMacKeymap;
+  }
+
+  public static void setWizardEditorScheme(@Nullable String wizardEditorScheme) {
+    ourWizardEditorScheme = wizardEditorScheme;
+  }
+
+  @Nullable
+  public static String getWizardEditorScheme() {
+    return ourWizardEditorScheme;
+  }
+
+  @Nullable
+  public static Boolean getAutoScrollToSource() {
+    return ourAutoScrollToSource;
+  }
+
+  public static void setAutoScrollToSource(@Nullable Boolean autoScrollToSource) {
+    ourAutoScrollToSource = autoScrollToSource;
+  }
+
+  public static Set<String> getFeaturedPluginsToInstall() {
+    return Collections.unmodifiableSet(ourFeaturedPluginsToInstall);
+  }
+
+  public static void setFeaturedPluginsToInstall(Set<String> pluginsToInstall) {
+    ourFeaturedPluginsToInstall.clear();
+    ourFeaturedPluginsToInstall.addAll(pluginsToInstall);
+  }
+}
diff --git a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
index 998620ffa599..4a390bc1383b 100644
--- a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
+++ b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
@@ -16,6 +16,7 @@
 package com.intellij.ide.ui;
 
 import com.intellij.ide.IdeBundle;
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
@@ -128,6 +129,9 @@ public class UISettings extends SimpleModificationTracker implements PersistentS
   public UISettings() {
     tweakPlatformDefaults();
     setSystemFontFaceAndSize();
+
+    Boolean scrollToSource = WelcomeWizardUtil.getAutoScrollToSource();
+    if (scrollToSource != null) DEFAULT_AUTOSCROLL_TO_SOURCE = scrollToSource;
   }
 
   private void tweakPlatformDefaults() {
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeKeyboardSchemeStepPanel.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeKeyboardSchemeStepPanel.java
index 53b215516c09..1b1779141ab6 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeKeyboardSchemeStepPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeKeyboardSchemeStepPanel.java
@@ -16,7 +16,7 @@
 package com.intellij.ide.customize;
 
 import com.intellij.CommonBundle;
-import com.intellij.idea.StartupUtil;
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.keymap.KeymapManager;
 import com.intellij.openapi.ui.VerticalFlowLayout;
@@ -37,7 +37,7 @@ public class CustomizeKeyboardSchemeStepPanel extends AbstractCustomizeWizardSte
     myMacPanel = createBigButtonPanel(new VerticalFlowLayout(), macRadioButton, new Runnable() {
       @Override
       public void run() {
-        StartupUtil.setMyWizardMacKeymap(KeymapManager.MAC_OS_X_10_5_PLUS_KEYMAP);
+        WelcomeWizardUtil.setWizardKeymap(KeymapManager.MAC_OS_X_10_5_PLUS_KEYMAP);
       }
     });
     String style = "<style type=\"text/css\">" +
@@ -62,7 +62,7 @@ public class CustomizeKeyboardSchemeStepPanel extends AbstractCustomizeWizardSte
     myDefaultPanel = createBigButtonPanel(new VerticalFlowLayout(),defaultRadioButton, new Runnable() {
       @Override
       public void run() {
-        StartupUtil.setMyWizardMacKeymap(KeymapManager.MAC_OS_X_KEYMAP);
+        WelcomeWizardUtil.setWizardKeymap(KeymapManager.MAC_OS_X_KEYMAP);
       }
     } );
     myDefaultPanel.add(defaultRadioButton);
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java
index c7b29ef53827..433110bba622 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java
@@ -16,64 +16,96 @@
 package com.intellij.ide.customize;
 
 import com.intellij.CommonBundle;
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.ide.ui.LafManager;
 import com.intellij.ide.ui.laf.IntelliJLaf;
 import com.intellij.ide.ui.laf.darcula.DarculaLaf;
-import com.intellij.ide.ui.laf.darcula.DarculaLookAndFeelInfo;
-import com.intellij.idea.StartupUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.options.OptionsBundle;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.util.IconUtil;
 import com.intellij.util.ui.UIUtil;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
-  protected static final String DEFAULT = "Default";
-  protected static final String DARCULA = "Darcula";
-  protected static final String INTELLIJ = "IntelliJ";
-  protected static final String ALLOY = "Alloy. IDEA Theme";
-  protected static final String GTK = "GTK+";
+  public static class ThemeInfo {
+    public final String name;
+    public final String previewFileName;
+    public final String laf;
+    
+    private Icon icon; 
+
+    public ThemeInfo(String name, String previewFileName, String laf) {
+      this.name = name;
+      this.previewFileName = previewFileName;
+      this.laf = laf;
+    }
+
+    private Icon getIcon() {
+      if (icon == null) {
+        String selector;
+        if (SystemInfo.isMac) {
+          selector = "OSX";
+        }
+        else if (SystemInfo.isWindows) {
+          selector = "Windows";
+        }
+        else {
+          selector = "Linux";
+        }
+        icon = IconLoader.getIcon("/lafs/" + selector + previewFileName + ".png");
+      }
+      return icon;
+    }
+    
+    public void apply() {
+    }
+  }
+  protected static final ThemeInfo AQUA = new ThemeInfo("Default", "Aqua", "com.apple.laf.AquaLookAndFeel");
+  protected static final ThemeInfo DARCULA = new ThemeInfo("Darcula", "Darcula", DarculaLaf.class.getName());
+  protected static final ThemeInfo INTELLIJ = new ThemeInfo("IntelliJ", "IntelliJ", IntelliJLaf.class.getName());
+  protected static final ThemeInfo ALLOY = new ThemeInfo("Alloy. IDEA Theme", "Alloy", "com.incors.plaf.alloy.AlloyIdea");
+  protected static final ThemeInfo GTK = new ThemeInfo("GTK+", "GTK", "com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
 
   private boolean myInitial = true;
   private boolean myColumnMode;
   private JLabel myPreviewLabel;
-  private Map<String, Icon> myLafNames = new LinkedHashMap<String, Icon>();
+  private Set<ThemeInfo> myThemes = new LinkedHashSet<ThemeInfo>();
 
   public CustomizeUIThemeStepPanel() {
     setLayout(createSmallBorderLayout());
     IconLoader.activate();
 
-    initLafs();
+    initThemes(myThemes);
 
-    myColumnMode = myLafNames.size() > 2;
-    JPanel buttonsPanel = new JPanel(new GridLayout(myColumnMode ? myLafNames.size() : 1, myColumnMode ? 1 : myLafNames.size(), 5, 5));
+    myColumnMode = myThemes.size() > 2;
+    JPanel buttonsPanel = new JPanel(new GridLayout(myColumnMode ? myThemes.size() : 1, myColumnMode ? 1 : myThemes.size(), 5, 5));
     ButtonGroup group = new ButtonGroup();
-    String myDefaultLafName = null;
+    ThemeInfo myDefaultTheme = null;
 
-    for (Map.Entry<String, Icon> entry : myLafNames.entrySet()) {
-      final String lafName = entry.getKey();
-      Icon icon = entry.getValue();
-      final JRadioButton radioButton = new JRadioButton(lafName, myDefaultLafName == null);
+    for (final ThemeInfo theme: myThemes) {
+      final JRadioButton radioButton = new JRadioButton(theme.name, myDefaultTheme == null);
       radioButton.setOpaque(false);
-      if (myDefaultLafName == null) {
+      if (myDefaultTheme == null) {
         radioButton.setSelected(true);
-        myDefaultLafName = lafName;
+        myDefaultTheme = theme;
       }
       final JPanel panel = createBigButtonPanel(createSmallBorderLayout(), radioButton, new Runnable() {
         @Override
         public void run() {
-          applyLaf(lafName, CustomizeUIThemeStepPanel.this);
+          applyLaf(theme, CustomizeUIThemeStepPanel.this);
+          theme.apply();
         }
       });
       panel.setBorder(createSmallEmptyBorder());
       panel.add(radioButton, myColumnMode ? BorderLayout.WEST : BorderLayout.NORTH);
+      Icon icon = theme.getIcon();
       final JLabel label = new JLabel(myColumnMode ? IconUtil.scale(IconUtil.cropIcon(icon, icon.getIconWidth() * 2 / 3, icon.getIconHeight() * 2 / 3), .5) : icon);
       label.setVerticalAlignment(SwingConstants.TOP);
       label.setHorizontalAlignment(SwingConstants.RIGHT);
@@ -92,35 +124,31 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
       wrapperPanel.add(myPreviewLabel);
       add(wrapperPanel, BorderLayout.CENTER);
     }
-    applyLaf(myDefaultLafName, this);
+    applyLaf(myDefaultTheme, this);
     myInitial = false;
   }
 
-  protected void initLafs() {
+  protected void initThemes(Collection<ThemeInfo> result) {
     if (SystemInfo.isMac) {
-      addLaf(DEFAULT, "/lafs/OSXAqua.png");
-      addLaf(DARCULA, "/lafs/OSXDarcula.png");
+      result.add(AQUA);
+      result.add(DARCULA);
     }
     else if (SystemInfo.isWindows) {
       //if (PlatformUtils.isIdeaCommunity()) {
-      addLaf(INTELLIJ,"/lafs/WindowsIntelliJ.png");
+      result.add(INTELLIJ);
       //}
       //else {
-      //  addLaf(ALLOY, "/lafs/WindowsAlloy.png");
+      //  addLaf(ALLOY);
       //}
-      addLaf(DARCULA, "/lafs/WindowsDarcula.png");
+      result.add(DARCULA);
     }
     else {
-      addLaf(INTELLIJ, "/lafs/LinuxIntelliJ.png");
-      addLaf(DARCULA, "/lafs/LinuxDarcula.png");
-      addLaf(GTK, "/lafs/LinuxGTK.png");
+      result.add(INTELLIJ);
+      result.add(DARCULA);
+      result.add(GTK);
     }
   }
 
-  protected final void addLaf(String name, String icon) {
-    myLafNames.put(name, IconLoader.getIcon(icon));
-  }
-
   @Override
   public Dimension getPreferredSize() {
     Dimension size = super.getPreferredSize();
@@ -146,17 +174,14 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
            + " | " + "Appearance";
   }
 
-  private void applyLaf(String lafName, Component component) {
-    UIManager.LookAndFeelInfo info = getLookAndFeelInfo(lafName);
+  private void applyLaf(ThemeInfo theme, Component component) {
+    UIManager.LookAndFeelInfo info = new UIManager.LookAndFeelInfo(theme.name, theme.laf);
     if (info == null) return;
     try {
       UIManager.setLookAndFeel(info.getClassName());
       String className = info.getClassName();
-      if (lafName == DARCULA) {
-        className = DarculaLookAndFeelInfo.CLASS_NAME;
-      }
       if (!myInitial) {
-        StartupUtil.setWizardLAF(className);
+        WelcomeWizardUtil.setWizardLAF(className);
       }
       Window window = SwingUtilities.getWindowAncestor(component);
       if (window != null) {
@@ -169,7 +194,7 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
         LafManager.getInstance().setCurrentLookAndFeel(info);
       }
       if (myColumnMode) {
-        myPreviewLabel.setIcon(myLafNames.get(lafName));
+        myPreviewLabel.setIcon(theme.getIcon());
         myPreviewLabel.setBorder(BorderFactory.createLineBorder(UIManager.getColor("Label.disabledForeground")));
       }
     }
@@ -186,14 +211,4 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
       e.printStackTrace();
     }
   }
-
-  @Nullable
-  private static UIManager.LookAndFeelInfo getLookAndFeelInfo(String name) {
-    if (DEFAULT.equals(name)) return new UIManager.LookAndFeelInfo(DEFAULT, "com.apple.laf.AquaLookAndFeel");
-    if (DARCULA.equals(name)) return new UIManager.LookAndFeelInfo(DARCULA, DarculaLaf.class.getName());
-    if (INTELLIJ.equals(name)) return new UIManager.LookAndFeelInfo(INTELLIJ, IntelliJLaf.class.getName());
-    if (ALLOY.equals(name)) return new UIManager.LookAndFeelInfo(ALLOY, "com.incors.plaf.alloy.AlloyIdea");
-    if (GTK.equals(name)) return new UIManager.LookAndFeelInfo(GTK, "com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
-    return null;
-  }
 }
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java b/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java
index b17805579869..938e9e867699 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java
@@ -15,10 +15,10 @@
  */
 package com.intellij.ide.customize;
 
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.ide.plugins.RepositoryHelper;
-import com.intellij.idea.StartupUtil;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.util.Condition;
@@ -329,7 +329,7 @@ public class PluginGroups {
     else {
       myFeaturedIds.remove(pluginId);
     }
-    StartupUtil.setFeaturedPluginsToInstall(myFeaturedIds);
+    WelcomeWizardUtil.setFeaturedPluginsToInstall(myFeaturedIds);
   }
 
   void setPluginEnabledWithDependencies(final String pluginId, boolean enabled) {
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
index a50d2f930b17..929d03d28db0 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
@@ -18,13 +18,13 @@ package com.intellij.ide.ui.laf;
 import com.intellij.CommonBundle;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.ide.ui.LafManager;
 import com.intellij.ide.ui.LafManagerListener;
 import com.intellij.ide.ui.UISettings;
 import com.intellij.ide.ui.laf.darcula.DarculaInstaller;
 import com.intellij.ide.ui.laf.darcula.DarculaLaf;
 import com.intellij.ide.ui.laf.darcula.DarculaLookAndFeelInfo;
-import com.intellij.idea.StartupUtil;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationListener;
 import com.intellij.notification.NotificationType;
@@ -221,7 +221,7 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
       if (laf != null) {
         boolean needUninstall = UIUtil.isUnderDarcula();
         setCurrentLookAndFeel(laf); // setup default LAF or one specified by readExternal.
-        if (StartupUtil.getWizardLAF() != null) {
+        if (WelcomeWizardUtil.getWizardLAF() != null) {
           if (UIUtil.isUnderDarcula()) {
             DarculaInstaller.install();
           }
@@ -315,8 +315,8 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
    * RubyMine uses Native L&F for linux as well
    */
   private UIManager.LookAndFeelInfo getDefaultLaf() {
-    if (StartupUtil.getWizardLAF() != null) {
-      UIManager.LookAndFeelInfo laf = findLaf(StartupUtil.getWizardLAF());
+    if (WelcomeWizardUtil.getWizardLAF() != null) {
+      UIManager.LookAndFeelInfo laf = findLaf(WelcomeWizardUtil.getWizardLAF());
       LOG.assertTrue(laf != null);
       return laf;
     }
@@ -337,7 +337,7 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
       }
     }
     // Default
-    final String defaultLafName = StartupUtil.getDefaultLAF();
+    final String defaultLafName = WelcomeWizardUtil.getDefaultLAF();
     if (defaultLafName != null) {
       UIManager.LookAndFeelInfo defaultLaf = findLaf(defaultLafName);
       if (defaultLaf != null) {
diff --git a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
index 10f9c7365cfe..fdf11dc54e4d 100644
--- a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
+++ b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
@@ -38,7 +38,9 @@ import javax.swing.*;
 import java.io.File;
 import java.lang.management.ManagementFactory;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
 
 /**
  * @author yole
@@ -47,46 +49,9 @@ public class StartupUtil {
   @NonNls public static final String NO_SPLASH = "nosplash";
 
   private static SocketLock ourLock;
-  private static String myDefaultLAF;
-  private static String myWizardLAF;
-  private static String myWizardMacKeymap;
-  private static Set<String> myFeaturedPluginsToInstall = new HashSet<String>();
 
   private StartupUtil() { }
 
-  public static void setDefaultLAF(String laf) {
-    myDefaultLAF = laf;
-  }
-
-  public static String getDefaultLAF() {
-    return myDefaultLAF;
-  }
-
-  public static void setWizardLAF(String myWizardLAF) {
-    StartupUtil.myWizardLAF = myWizardLAF;
-  }
-
-  public static String getWizardLAF() {
-    return myWizardLAF;
-  }
-
-  public static void setMyWizardMacKeymap(String myWizardMacKeymap) {
-    StartupUtil.myWizardMacKeymap = myWizardMacKeymap;
-  }
-
-  public static String getMyWizardMacKeymap() {
-    return myWizardMacKeymap;
-  }
-
-  public static Set<String> getMyFeaturedPluginsToInstall() {
-    return Collections.unmodifiableSet(myFeaturedPluginsToInstall);
-  }
-
-  public static void setFeaturedPluginsToInstall(Set<String> pluginsToInstall) {
-    myFeaturedPluginsToInstall.clear();
-    myFeaturedPluginsToInstall.addAll(pluginsToInstall);
-  }
-
   public static boolean shouldShowSplash(final String[] args) {
     return !Arrays.asList(args).contains(NO_SPLASH);
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
index 0d0377bdf7fe..7f83539afc5a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
@@ -19,6 +19,7 @@
  */
 package com.intellij.openapi.editor.colors.impl;
 
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.ide.ui.LafManager;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
@@ -89,7 +90,14 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name
 
     loadAdditionalTextAttributes();
 
-    setGlobalSchemeInner(myDefaultColorSchemesManager.getAllSchemes()[0]);
+    String wizardEditorScheme = WelcomeWizardUtil.getWizardEditorScheme();
+    EditorColorsScheme scheme = null;
+    if (wizardEditorScheme != null) {
+      scheme = getScheme(wizardEditorScheme);
+      LOG.assertTrue(scheme != null, "Wizard scheme " + wizardEditorScheme + " not found");
+    }
+    if (scheme == null) scheme = myDefaultColorSchemesManager.getAllSchemes()[0]; 
+    setGlobalSchemeInner(scheme);
   }
 
   private static boolean isUnitTestOrHeadlessMode() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultKeymap.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultKeymap.java
index ce1bcbe3c64e..f1ecd44b3fa1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultKeymap.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultKeymap.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.openapi.keymap.impl;
 
-import com.intellij.idea.StartupUtil;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.Extensions;
@@ -87,7 +86,7 @@ public class DefaultKeymap {
 
   public String getDefaultKeymapName() {
     if (SystemInfo.isMac) {
-      return StartupUtil.getMyWizardMacKeymap() != null ? StartupUtil.getMyWizardMacKeymap() : KeymapManager.MAC_OS_X_KEYMAP;
+      return KeymapManager.MAC_OS_X_KEYMAP;
     }
     else if (SystemInfo.isXWindow) {
       return KeymapManager.X_WINDOW_KEYMAP;
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
index b64d0b0362e2..580537c7b8ba 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.openapi.keymap.impl;
 
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.openapi.actionSystem.IdeActions;
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.keymap.Keymap;
@@ -75,7 +76,9 @@ public class KeymapManagerImpl extends KeymapManagerEx implements PersistentStat
                                                     RoamingType.PER_USER);
 
     Keymap[] keymaps = defaultKeymap.getKeymaps();
-    String systemDefaultKeymap = defaultKeymap.getDefaultKeymapName();
+    String systemDefaultKeymap = WelcomeWizardUtil.getWizardMacKeymap() != null
+                                 ? WelcomeWizardUtil.getWizardMacKeymap()
+                                 : defaultKeymap.getDefaultKeymapName();
     for (Keymap keymap : keymaps) {
       addKeymap(keymap);
       if (systemDefaultKeymap.equals(keymap.getName())) {

From b5c02da41e97a7e7a78c5aaa791e5f54cf425cec Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Mon, 27 Oct 2014 09:22:19 +0100
Subject: [PATCH 059/132] IDEA-128476 UI of Customize IDE wizard is broken
 after theme change

---
 .../CustomizeFeaturedPluginsStepPanel.java         |  5 +----
 .../ide/customize/CustomizePluginsStepPanel.java   | 14 ++++++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
index 4371c3c991cf..61b3ac4ab20c 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
@@ -56,10 +56,7 @@ public class CustomizeFeaturedPluginsStepPanel extends AbstractCustomizeWizardSt
   public CustomizeFeaturedPluginsStepPanel(PluginGroups pluginGroups) throws OfflineException {
     setLayout(new GridLayout(1, 1));
     JPanel gridPanel = new JPanel(new GridLayout(0, 3));
-    JBScrollPane scrollPane =
-      new JBScrollPane(gridPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-    scrollPane.getVerticalScrollBar().setUnitIncrement(10);
-    scrollPane.setBorder(null);
+    JBScrollPane scrollPane = CustomizePluginsStepPanel.createScrollPane(gridPanel);
 
     Map<String, String> config = pluginGroups.getFeaturedPlugins();
     boolean isEmptyOrOffline = true;
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizePluginsStepPanel.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizePluginsStepPanel.java
index de12269b5887..38630cd80708 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizePluginsStepPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizePluginsStepPanel.java
@@ -30,6 +30,7 @@ import com.intellij.ui.components.labels.LinkListener;
 
 import javax.swing.*;
 import javax.swing.border.CompoundBorder;
+import javax.swing.border.EmptyBorder;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -60,10 +61,7 @@ public class CustomizePluginsStepPanel extends AbstractCustomizeWizardStep imple
     setLayout(myCardLayout);
     JPanel gridPanel = new JPanel(new GridLayout(0, COLS));
     myCustomizePanel = new IdSetPanel();
-    JBScrollPane scrollPane =
-      new JBScrollPane(gridPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-    scrollPane.getVerticalScrollBar().setUnitIncrement(10);
-    scrollPane.setBorder(null);
+    JBScrollPane scrollPane = createScrollPane(gridPanel);
     add(scrollPane, MAIN);
     add(myCustomizePanel, CUSTOMIZE);
 
@@ -144,6 +142,14 @@ public class CustomizePluginsStepPanel extends AbstractCustomizeWizardStep imple
     }
   }
 
+  static JBScrollPane createScrollPane(JPanel gridPanel) {
+    JBScrollPane scrollPane =
+      new JBScrollPane(gridPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+    scrollPane.getVerticalScrollBar().setUnitIncrement(10);
+    scrollPane.setBorder(new EmptyBorder(0, 0, 0, 0)); // to disallow resetting border on LaF change
+    return scrollPane;
+  }
+
   @Override
   public void linkSelected(LinkLabel linkLabel, String command) {
     if (command == null || !command.contains(":")) return;

From c0a7c5286ab594b134ca2201b8090a854916b643 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Mon, 27 Oct 2014 09:24:19 +0100
Subject: [PATCH 060/132] new View Mode action breaks Ctrl+~,UP pattern for
 accessing LaFs

---
 platform/platform-resources/src/idea/PlatformActions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index f989604a8c65..014c6306a701 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -583,8 +583,8 @@
     <group id="ChangeScheme">
       <action id="ChangeColorScheme" class="com.intellij.ide.actions.QuickChangeColorSchemeAction"/>
       <action id="ChangeKeymap" class="com.intellij.ide.actions.QuickChangeKeymapAction"/>
-      <action id="ChangeLaf" class="com.intellij.ide.actions.QuickChangeLookAndFeel"/>
       <action id="ChangeView" class="com.intellij.ide.actions.QuickChangeViewModeAction"/>
+      <action id="ChangeLaf" class="com.intellij.ide.actions.QuickChangeLookAndFeel"/>
     </group>
 
     <action id="MaintenanceAction" class="com.intellij.ide.actions.MaintenanceAction"/>

From 3b2dabf77479acb3a66e57451905a0d4f32471a8 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Thu, 23 Oct 2014 00:08:48 +0200
Subject: [PATCH 061/132] 'preload build process' optimization, initial (off in
 registry by default).

---
 .../compiler/server/BuildManager.java         | 280 ++++++++++++------
 .../server/BuildMessageDispatcher.java        |  69 ++++-
 .../server/BuilderMessageHandler.java         |  18 ++
 ...per.java => DelegatingMessageHandler.java} |  15 +-
 .../PreloadedProcessMessageHandler.java       |  48 +++
 .../org/jetbrains/jps/cmdline/BuildMain.java  |  72 ++++-
 .../jetbrains/jps/cmdline/BuildRunner.java    |  16 +-
 .../jetbrains/jps/cmdline/BuildSession.java   |  99 +++++--
 .../jetbrains/jps/cmdline/PreloadedData.java  |  71 +++++
 .../org/jetbrains/jps/build/Standalone.java   |   3 +-
 .../util/resources/misc/registry.properties   |   3 +
 11 files changed, 539 insertions(+), 155 deletions(-)
 rename java/compiler/impl/src/com/intellij/compiler/server/{MessageHandlerWrapper.java => DelegatingMessageHandler.java} (59%)
 create mode 100644 java/compiler/impl/src/com/intellij/compiler/server/PreloadedProcessMessageHandler.java
 create mode 100644 jps/jps-builders/src/org/jetbrains/jps/cmdline/PreloadedData.java

diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index bc31490a54b6..23dc33a9b627 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -58,10 +58,7 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl;
 import com.intellij.openapi.roots.*;
 import com.intellij.openapi.startup.StartupManager;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.ShutDownTracker;
-import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.*;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
@@ -103,8 +100,7 @@ import org.jetbrains.jps.cmdline.ClasspathBootstrap;
 import org.jetbrains.jps.incremental.Utils;
 import org.jetbrains.jps.model.serialization.JpsGlobalLoader;
 
-import javax.tools.JavaCompiler;
-import javax.tools.ToolProvider;
+import javax.tools.*;
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
@@ -154,6 +150,8 @@ public class BuildManager implements ApplicationComponent{
 
   private final Map<RequestFuture, Project> myAutomakeFutures = Collections.synchronizedMap(new HashMap<RequestFuture, Project>());
   private final Map<String, RequestFuture> myBuildsInProgress = Collections.synchronizedMap(new HashMap<String, RequestFuture>());
+  private final Map<String, Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>> myPreloadedBuilds = 
+    Collections.synchronizedMap(new HashMap<String, Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>>());
   private final BuildProcessClasspathManager myClasspathManager = new BuildProcessClasspathManager();
   private final SequentialTaskExecutor myRequestsProcessor = new SequentialTaskExecutor(PooledThreadExecutor.INSTANCE);
   private final Map<String, ProjectData> myProjectDataMap = Collections.synchronizedMap(new HashMap<String, ProjectData>());
@@ -385,6 +383,8 @@ public class BuildManager implements ApplicationComponent{
   }
 
   public void clearState(Project project) {
+    cancelPreloadedBuilds(project);
+    
     final String projectPath = getProjectPath(project);
     synchronized (myProjectDataMap) {
       final ProjectData data = myProjectDataMap.get(projectPath);
@@ -540,6 +540,15 @@ public class BuildManager implements ApplicationComponent{
     return futures;
   }
 
+  private String cancelPreloadedBuilds(Project project) {
+    final String projectPath = getProjectPath(project);
+    final Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> pair = myPreloadedBuilds.remove(projectPath);
+    if (pair != null) {
+      myMessageDispatcher.cancelSession(pair.first.getRequestID());
+    }
+    return projectPath;
+  }
+
   @Nullable
   public RequestFuture scheduleBuild(
     final Project project, final boolean isRebuild, final boolean isMake,
@@ -548,53 +557,34 @@ public class BuildManager implements ApplicationComponent{
     final Map<String, String> userData, final DefaultMessageHandler messageHandler) {
 
     final String projectPath = getProjectPath(project);
-    final UUID sessionId = UUID.randomUUID();
-    final boolean isAutomake = messageHandler instanceof AutoMakeMessageHandler;
-    final BuilderMessageHandler handler = new MessageHandlerWrapper(messageHandler) {
-      @Override
-      public void buildStarted(UUID sessionId) {
-        super.buildStarted(sessionId);
-        try {
-          ApplicationManager.getApplication().getMessageBus().syncPublisher(BuildManagerListener.TOPIC).buildStarted(project, sessionId, isAutomake);
-        }
-        catch (Throwable e) {
-          LOG.error(e);
-        }
-      }
 
-      @Override
-      public void sessionTerminated(UUID sessionId) {
-        try {
-          super.sessionTerminated(sessionId);
-        }
-        finally {
-          try {
-            ApplicationManager.getApplication().getMessageBus().syncPublisher(BuildManagerListener.TOPIC).buildFinished(project, sessionId, isAutomake);
-          }
-          catch (Throwable e) {
-            LOG.error(e);
-          }
-        }
-      }
-    };
-    // ensure server is listening
-    if (myListenPort < 0) {
-      try {
-        synchronized (this) {
-          if (myListenPort < 0) {
-            myListenPort = startListening();
-          }
-        }
-      }
-      catch (Exception e) {
-        handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure(e.getMessage(), null));
-        handler.sessionTerminated(sessionId);
-        return null;
-      }
+    final Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> preloaded = myPreloadedBuilds.get(projectPath);
+    final RequestFuture<PreloadedProcessMessageHandler> preloadedFuture = preloaded != null? preloaded.first : null;
+    final boolean usingPreloadedProcess = preloadedFuture != null && myMessageDispatcher.acquirePreloadedSessionIfReady(preloadedFuture.getRequestID());
+    
+    final UUID sessionId;
+    final BuilderMessageHandler handler = new NotifyingMessageHandler(project, messageHandler, messageHandler instanceof AutoMakeMessageHandler);
+    if (usingPreloadedProcess) {
+      LOG.info("Using preloaded build process to compile " + projectPath);
+      sessionId = preloadedFuture.getRequestID();
+      preloadedFuture.getMessageHandler().setDelegateHandler(handler);
+      myPreloadedBuilds.remove(projectPath);
+    }
+    else {
+      sessionId = UUID.randomUUID();
+    }
+    
+    try {
+      ensureListening();
+    }
+    catch (Exception e) {
+      handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure(e.getMessage(), null));
+      handler.sessionTerminated(sessionId);
+      return null;
     }
 
     try {
-      final RequestFuture<BuilderMessageHandler> future = new RequestFuture<BuilderMessageHandler>(handler, sessionId, new RequestFuture.CancelAction<BuilderMessageHandler>() {
+      final RequestFuture<? extends BuilderMessageHandler> future = usingPreloadedProcess? preloadedFuture : new RequestFuture<BuilderMessageHandler>(handler, sessionId, new RequestFuture.CancelAction<BuilderMessageHandler>() {
         @Override
         public void cancel(RequestFuture<BuilderMessageHandler> future) throws Exception {
           myMessageDispatcher.cancelSession(future.getRequestID());
@@ -605,16 +595,15 @@ public class BuildManager implements ApplicationComponent{
       runCommand(new Runnable() {
         @Override
         public void run() {
-          if (future.isCancelled() || project.isDisposed()) {
+          if (!usingPreloadedProcess && (future.isCancelled() || project.isDisposed())) {
+            // in case of preloaded process the process was already running, so the handler will be notified upon process termination
             handler.sessionTerminated(sessionId);
             future.setDone();
             return;
           }
 
           final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings globals =
-            CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings.newBuilder()
-              .setGlobalOptionsPath(PathManager.getOptionsPath())
-              .build();
+            CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings.newBuilder().setGlobalOptionsPath(PathManager.getOptionsPath()).build();
           CmdlineRemoteProto.Message.ControllerMessage.FSEvent currentFSChanges;
           final SequentialTaskExecutor projectTaskQueue;
           synchronized (myProjectDataMap) {
@@ -646,21 +635,11 @@ public class BuildManager implements ApplicationComponent{
             params = CmdlineProtoUtil.createUpToDateCheckRequest(projectPath, scopes, paths, userData, globals, currentFSChanges);
           }
           else {
-            params = CmdlineProtoUtil.createBuildRequest(projectPath, scopes, isMake ? Collections.<String>emptyList() : paths,
-                                                         userData, globals, currentFSChanges);
+            params = CmdlineProtoUtil.createBuildRequest(projectPath, scopes, isMake ? Collections.<String>emptyList() : paths, userData, globals, currentFSChanges);
+          }
+          if (!usingPreloadedProcess) {
+            myMessageDispatcher.registerBuildMessageHandler(future, params);
           }
-
-          myMessageDispatcher.registerBuildMessageHandler(sessionId, new MessageHandlerWrapper(handler) {
-            @Override
-            public void sessionTerminated(UUID sessionId) {
-              try {
-                super.sessionTerminated(sessionId);
-              }
-              finally {
-                future.setDone();
-              }
-            }
-          }, params);
 
           try {
             projectTaskQueue.submit(new Runnable() {
@@ -669,33 +648,46 @@ public class BuildManager implements ApplicationComponent{
                 Throwable execFailure = null;
                 try {
                   if (project.isDisposed()) {
-                    return;
+                    if (usingPreloadedProcess) {
+                      future.cancel(true);
+                    }
+                    else {
+                      return;
+                    }
                   }
                   myBuildsInProgress.put(projectPath, future);
-                  final OSProcessHandler processHandler = launchBuildProcess(project, myListenPort, sessionId);
-                  final StringBuilder stdErrOutput = new StringBuilder();
-                  processHandler.addProcessListener(new ProcessAdapter() {
-                    @Override
-                    public void onTextAvailable(ProcessEvent event, Key outputType) {
-                      // re-translate builder's output to idea.log
-                      final String text = event.getText();
-                      if (!StringUtil.isEmptyOrSpaces(text)) {
-                        LOG.info("BUILDER_PROCESS [" + outputType.toString() + "]: " + text.trim());
-                        if (stdErrOutput.length() < 1024 && ProcessOutputTypes.STDERR.equals(outputType)) {
-                          stdErrOutput.append(text);
+                  final OSProcessHandler processHandler;
+                  final StringBuilder errorsOnLaunch = new StringBuilder();
+                  if (usingPreloadedProcess) {
+                    myMessageDispatcher.sendBuildParameters(future.getRequestID(), params);
+                    processHandler = preloaded.second;
+                  }
+                  else {
+                    processHandler = launchBuildProcess(project, myListenPort, sessionId, false);
+                    processHandler.addProcessListener(new ProcessAdapter() {
+                      @Override
+                      public void onTextAvailable(ProcessEvent event, Key outputType) {
+                        if (ProcessOutputTypes.STDERR.equals(outputType)) {
+                          if (errorsOnLaunch.length() < 1024) {
+                            final String text = event.getText();
+                            if (!StringUtil.isEmptyOrSpaces(text)) {
+                              errorsOnLaunch.append(text);
+                            }
+                          }
                         }
                       }
-                    }
-                  });
-                  processHandler.startNotify();
+                    });
+                    processHandler.startNotify();
+                  }
+
                   final boolean terminated = processHandler.waitFor();
                   if (terminated) {
                     final int exitValue = processHandler.getProcess().exitValue();
                     if (exitValue != 0) {
                       final StringBuilder msg = new StringBuilder();
                       msg.append("Abnormal build process termination: ");
-                      if (stdErrOutput.length() > 0) {
-                        msg.append("\n").append(stdErrOutput);
+                      if (errorsOnLaunch.length() > 0) {
+                        msg.append("\n").append(errorsOnLaunch);
                       }
                       else {
                         msg.append("unknown error");
@@ -723,6 +715,17 @@ public class BuildManager implements ApplicationComponent{
                       unregistered.sessionTerminated(sessionId);
                     }
                   }
+
+                  if (Registry.is("compiler.process.preload") && !myPreloadedBuilds.containsKey(projectPath) && !project.isDisposed()) {
+                    try {
+                      final Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> pair = launchPreloadedBuildProcess(project);
+                      myPreloadedBuilds.put(projectPath, pair);
+                    }
+                    catch (Exception e) {
+                      LOG.info("Error pre-loading build process for project " + projectPath, e);
+                    }
+                  }
+                  
                 }
               }
             });
@@ -747,6 +750,16 @@ public class BuildManager implements ApplicationComponent{
     return null;
   }
 
+  private void ensureListening() throws Exception {
+    if (myListenPort < 0) {
+      synchronized (this) {
+        if (myListenPort < 0) {
+          myListenPort = startListening();
+        }
+      }
+    }
+  }
+
   @Override
   public void initComponent() {
   }
@@ -762,7 +775,40 @@ public class BuildManager implements ApplicationComponent{
     return "com.intellij.compiler.server.BuildManager";
   }
 
-  private OSProcessHandler launchBuildProcess(Project project, final int port, final UUID sessionId) throws ExecutionException {
+  private Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> launchPreloadedBuildProcess(final Project project) throws Exception {
+    ensureListening();
+    
+    final RequestFuture<PreloadedProcessMessageHandler> future = new RequestFuture<PreloadedProcessMessageHandler>(new PreloadedProcessMessageHandler(project), UUID.randomUUID(), new RequestFuture.CancelAction<PreloadedProcessMessageHandler>() {
+      @Override
+      public void cancel(RequestFuture<PreloadedProcessMessageHandler> future) throws Exception {
+        myMessageDispatcher.cancelSession(future.getRequestID());
+      }
+    });
+    myMessageDispatcher.registerBuildMessageHandler(future, null);
+    try {
+      final OSProcessHandler processHandler = launchBuildProcess(project, myListenPort, future.getRequestID(), true);
+      processHandler.addProcessListener(new ProcessAdapter() {
+        @Override
+        public void onTextAvailable(ProcessEvent event, Key outputType) {
+          if (ProcessOutputTypes.STDERR.equals(outputType)) {
+            final String text = event.getText();
+            if (!StringUtil.isEmptyOrSpaces(text)) {
+              LOG.info("PRELOADED_BUILD_PROCESS: " + text);
+            }
+          }
+        }
+      });
+      
+      processHandler.startNotify();
+      return Pair.create(future, processHandler);
+    }
+    catch (ExecutionException e) {
+      myMessageDispatcher.unregisterBuildMessageHandler(future.getRequestID());
+      throw e;
+    }
+  }
+  
+  private OSProcessHandler launchBuildProcess(Project project, final int port, final UUID sessionId, boolean requestProjectPreload) throws ExecutionException {
     final String compilerPath;
     final String vmExecutablePath;
     JavaSdkVersion sdkVersion = null;
@@ -863,6 +909,11 @@ public class BuildManager implements ApplicationComponent{
     }
     cmdLine.addParameter("-Djdt.compiler.useSingleThread=true"); // always run eclipse compiler in single-threaded mode
 
+    if (requestProjectPreload) {
+      cmdLine.addParameter("-Dpreload.project.path=" + FileUtil.toCanonicalPath(getProjectPath(project)));
+      cmdLine.addParameter("-Dpreload.config.path=" + FileUtil.toCanonicalPath(PathManager.getOptionsPath()));
+    }
+    
     final String shouldGenerateIndex = System.getProperty(GlobalOptions.GENERATE_CLASSPATH_INDEX_OPTION);
     if (shouldGenerateIndex != null) {
       cmdLine.addParameter("-D"+ GlobalOptions.GENERATE_CLASSPATH_INDEX_OPTION +"=" + shouldGenerateIndex);
@@ -961,12 +1012,24 @@ public class BuildManager implements ApplicationComponent{
 
     final Process process = cmdLine.createProcess();
 
-    return new OSProcessHandler(process, null, mySystemCharset) {
+    final OSProcessHandler processHandler = new OSProcessHandler(process, null, mySystemCharset) {
       @Override
       protected boolean shouldDestroyProcessRecursively() {
         return true;
       }
     };
+    processHandler.addProcessListener(new ProcessAdapter() {
+      @Override
+      public void onTextAvailable(ProcessEvent event, Key outputType) {
+        // re-translate builder's output to idea.log
+        final String text = event.getText();
+        if (!StringUtil.isEmptyOrSpaces(text)) {
+          LOG.info("BUILDER_PROCESS [" + outputType.toString() + "]: " + text.trim());
+        }
+      }
+    });
+    
+    return processHandler;
   }
 
   public File getBuildSystemDirectory() {
@@ -1086,6 +1149,50 @@ public class BuildManager implements ApplicationComponent{
     }
   }
 
+  private static class NotifyingMessageHandler extends DelegatingMessageHandler {
+    private final Project myProject;
+    private final BuilderMessageHandler myDelegateHandler;
+    private boolean myIsAutomake;
+
+    public NotifyingMessageHandler(@NotNull Project project, @NotNull BuilderMessageHandler delegateHandler, final boolean isAutomake) {
+      myProject = project;
+      myDelegateHandler = delegateHandler;
+      myIsAutomake = isAutomake;
+    }
+
+    @Override
+    protected BuilderMessageHandler getDelegateHandler() {
+      return myDelegateHandler;
+    }
+
+    @Override
+    public void buildStarted(UUID sessionId) {
+      super.buildStarted(sessionId);
+      try {
+        ApplicationManager
+          .getApplication().getMessageBus().syncPublisher(BuildManagerListener.TOPIC).buildStarted(myProject, sessionId, myIsAutomake);
+      }
+      catch (Throwable e) {
+        LOG.error(e);
+      }
+    }
+
+    @Override
+    public void sessionTerminated(UUID sessionId) {
+      try {
+        super.sessionTerminated(sessionId);
+      }
+      finally {
+        try {
+          ApplicationManager.getApplication().getMessageBus().syncPublisher(BuildManagerListener.TOPIC).buildFinished(myProject, sessionId, myIsAutomake);
+        }
+        catch (Throwable e) {
+          LOG.error(e);
+        }
+      }
+    }
+  }
+
   private class ProjectWatcher extends ProjectManagerAdapter {
     private final Map<Project, MessageBusConnection> myConnections = new HashMap<Project, MessageBusConnection>();
 
@@ -1169,6 +1276,7 @@ public class BuildManager implements ApplicationComponent{
 
     @Override
     public void projectClosing(Project project) {
+      cancelPreloadedBuilds(project);
       for (RequestFuture future : cancelAutoMakeTasks(project)) {
         future.waitFor(500, TimeUnit.MILLISECONDS);
       }
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
index d324a620155b..7ee922211e57 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
@@ -21,10 +21,12 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.AttributeKey;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.io.SimpleChannelInboundHandlerAdapter;
 import org.jetbrains.jps.api.CmdlineProtoUtil;
 import org.jetbrains.jps.api.CmdlineRemoteProto;
+import org.jetbrains.jps.api.RequestFuture;
 
 import java.util.Map;
 import java.util.Set;
@@ -41,19 +43,34 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
 
   private static final AttributeKey<SessionData> SESSION_DATA = AttributeKey.valueOf("BuildMessageDispatcher.sessionData");
 
-  private final Map<UUID, SessionData> myMessageHandlers = new ConcurrentHashMap<UUID, SessionData>(16, 0.75f, 1);
+  private final Map<UUID, SessionData> mySessionDescriptors = new ConcurrentHashMap<UUID, SessionData>(16, 0.75f, 1);
   private final Set<UUID> myCanceledSessions = new ConcurrentHashSet<UUID>();
 
-  public void registerBuildMessageHandler(UUID sessionId,
-                                          BuilderMessageHandler handler,
-                                          CmdlineRemoteProto.Message.ControllerMessage params) {
-    myMessageHandlers.put(sessionId, new SessionData(sessionId, handler, params));
+  public void registerBuildMessageHandler(@NotNull final RequestFuture<? extends BuilderMessageHandler> future, @Nullable CmdlineRemoteProto.Message.ControllerMessage params) {
+    final BuilderMessageHandler wrappedHandler = new DelegatingMessageHandler() {
+      @Override
+      protected BuilderMessageHandler getDelegateHandler() {
+        return future.getMessageHandler();
+      }
+      
+      @Override
+      public void sessionTerminated(UUID sessionId) {
+        try {
+          super.sessionTerminated(sessionId);
+        }
+        finally {
+          future.setDone();
+        }
+      }
+    };
+    final UUID sessionId = future.getRequestID();
+    mySessionDescriptors.put(sessionId, new SessionData(sessionId, wrappedHandler, params));
   }
 
   @Nullable
   public BuilderMessageHandler unregisterBuildMessageHandler(UUID sessionId) {
     myCanceledSessions.remove(sessionId);
-    final SessionData data = myMessageHandlers.remove(sessionId);
+    final SessionData data = mySessionDescriptors.remove(sessionId);
     return data != null? data.handler : null;
   }
 
@@ -74,11 +91,26 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
 
   @Nullable
   public Channel getAssociatedChannel(final UUID sessionId) {
-    final SessionData data = myMessageHandlers.get(sessionId);
+    final SessionData data = mySessionDescriptors.get(sessionId);
     return data != null? data.channel : null;
   }
 
-
+  public boolean acquirePreloadedSessionIfReady(final UUID sessionId) {
+    final SessionData data = mySessionDescriptors.get(sessionId);
+    return data != null && data.getAndClearWaitingFlag();
+  }
+  
+  public void sendBuildParameters(final UUID preloadedSessionId, CmdlineRemoteProto.Message.ControllerMessage params) {
+    final SessionData sessionData = mySessionDescriptors.get(preloadedSessionId);
+    if (sessionData != null) {
+      final Channel channel = sessionData.channel;
+      if (channel != null && channel.isActive() && sessionData.handler != null) {
+        sessionData.handler.buildStarted(preloadedSessionId);
+        channel.writeAndFlush(CmdlineProtoUtil.toMessage(preloadedSessionId, params));
+      }
+    }
+  }
+  
   @Override
   protected void messageReceived(ChannelHandlerContext context, CmdlineRemoteProto.Message message) throws Exception {
     SessionData sessionData = context.attr(SESSION_DATA).get();
@@ -89,7 +121,7 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
       final CmdlineRemoteProto.Message.UUID id = message.getSessionId();
       sessionId = new UUID(id.getMostSigBits(), id.getLeastSigBits());
 
-      sessionData = myMessageHandlers.get(sessionId);
+      sessionData = mySessionDescriptors.get(sessionId);
       if (sessionData != null) {
         sessionData.channel = context.channel();
         context.attr(SESSION_DATA).set(sessionData);
@@ -125,7 +157,9 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
             sessionData.params = null;
             context.writeAndFlush(CmdlineProtoUtil.toMessage(sessionId, params));
           }
-          else {
+          else if (!sessionData.setReadyAndWaiting()) {
+            // this message is expected to be sent only once.
+            // To be on the safe side, cancel the session
             cancelSession(sessionId);
           }
         }
@@ -169,11 +203,26 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
     final BuilderMessageHandler handler;
     volatile CmdlineRemoteProto.Message.ControllerMessage params;
     volatile Channel channel;
+    private boolean isReadyAndWaiting = false;
 
     private SessionData(UUID sessionId, BuilderMessageHandler handler, CmdlineRemoteProto.Message.ControllerMessage params) {
       this.sessionId = sessionId;
       this.handler = handler;
       this.params = params;
     }
+
+    public synchronized boolean setReadyAndWaiting() {
+      if (!isReadyAndWaiting) {
+        isReadyAndWaiting = true;
+        return true;
+      }
+      return false;
+    }
+    
+    public synchronized boolean getAndClearWaitingFlag() {
+      final boolean wasWaiting = isReadyAndWaiting;
+      isReadyAndWaiting = false;
+      return wasWaiting;
+    }
   }
 }
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuilderMessageHandler.java b/java/compiler/impl/src/com/intellij/compiler/server/BuilderMessageHandler.java
index 4681f859639d..2c8581110213 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuilderMessageHandler.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuilderMessageHandler.java
@@ -25,6 +25,24 @@ import java.util.UUID;
  *         Date: 4/25/12
  */
 public interface BuilderMessageHandler {
+  BuilderMessageHandler DEAF = new BuilderMessageHandler() {
+    @Override
+    public void buildStarted(UUID sessionId) {
+    }
+
+    @Override
+    public void handleBuildMessage(Channel channel, UUID sessionId, CmdlineRemoteProto.Message.BuilderMessage msg) {
+    }
+
+    @Override
+    public void handleFailure(UUID sessionId, CmdlineRemoteProto.Message.Failure failure) {
+    }
+
+    @Override
+    public void sessionTerminated(UUID sessionId) {
+    }
+  };
+  
   void buildStarted(UUID sessionId);
   
   void handleBuildMessage(Channel channel, UUID sessionId, CmdlineRemoteProto.Message.BuilderMessage msg);
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/MessageHandlerWrapper.java b/java/compiler/impl/src/com/intellij/compiler/server/DelegatingMessageHandler.java
similarity index 59%
rename from java/compiler/impl/src/com/intellij/compiler/server/MessageHandlerWrapper.java
rename to java/compiler/impl/src/com/intellij/compiler/server/DelegatingMessageHandler.java
index 68b5d5c9d5c4..653f3c7f0963 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/MessageHandlerWrapper.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/DelegatingMessageHandler.java
@@ -9,30 +9,27 @@ import java.util.UUID;
 * @author Eugene Zhuravlev
 *         Date: 7/3/13
 */
-class MessageHandlerWrapper implements BuilderMessageHandler {
-  private final BuilderMessageHandler myHandler;
+abstract class DelegatingMessageHandler implements BuilderMessageHandler {
 
-  public MessageHandlerWrapper(BuilderMessageHandler handler) {
-    myHandler = handler;
-  }
+  protected abstract BuilderMessageHandler getDelegateHandler();
 
   @Override
   public void buildStarted(UUID sessionId) {
-    myHandler.buildStarted(sessionId);
+    getDelegateHandler().buildStarted(sessionId);
   }
 
   @Override
   public void handleBuildMessage(Channel channel, UUID sessionId, CmdlineRemoteProto.Message.BuilderMessage msg) {
-    myHandler.handleBuildMessage(channel, sessionId, msg);
+    getDelegateHandler().handleBuildMessage(channel, sessionId, msg);
   }
 
   @Override
   public void handleFailure(UUID sessionId, CmdlineRemoteProto.Message.Failure failure) {
-    myHandler.handleFailure(sessionId, failure);
+    getDelegateHandler().handleFailure(sessionId, failure);
   }
 
   @Override
   public void sessionTerminated(UUID sessionId) {
-    myHandler.sessionTerminated(sessionId);
+    getDelegateHandler().sessionTerminated(sessionId);
   }
 }
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/PreloadedProcessMessageHandler.java b/java/compiler/impl/src/com/intellij/compiler/server/PreloadedProcessMessageHandler.java
new file mode 100644
index 000000000000..5a8c3e28a1c6
--- /dev/null
+++ b/java/compiler/impl/src/com/intellij/compiler/server/PreloadedProcessMessageHandler.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.compiler.server;
+
+import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
+
+/**
+* @author Eugene Zhuravlev
+*         Date: 20-Oct-14
+*/
+class PreloadedProcessMessageHandler extends DelegatingMessageHandler {
+  @NotNull 
+  private final Project myProject;
+  private volatile BuilderMessageHandler myDelegateHandler;
+
+  public PreloadedProcessMessageHandler(@NotNull Project project) {
+    myProject = project;
+  }
+
+  @NotNull
+  public Project getProject() {
+    return myProject;
+  }
+
+  @Override
+  protected BuilderMessageHandler getDelegateHandler() {
+    final BuilderMessageHandler delegate = myDelegateHandler;
+    return delegate != null? delegate : BuilderMessageHandler.DEAF;
+  }
+
+  public void setDelegateHandler(BuilderMessageHandler delegateHandler) {
+    myDelegateHandler = delegateHandler;
+  }
+}
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
index 8a082740ebee..e42d009d7122 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
@@ -35,7 +35,11 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.api.CmdlineProtoUtil;
 import org.jetbrains.jps.api.CmdlineRemoteProto;
 import org.jetbrains.jps.api.GlobalOptions;
+import org.jetbrains.jps.incremental.MessageHandler;
 import org.jetbrains.jps.incremental.Utils;
+import org.jetbrains.jps.incremental.fs.BuildFSState;
+import org.jetbrains.jps.incremental.fs.FSState;
+import org.jetbrains.jps.incremental.messages.BuildMessage;
 import org.jetbrains.jps.service.SharedThreadPool;
 
 import java.io.*;
@@ -49,6 +53,9 @@ import java.util.concurrent.TimeUnit;
  */
 @SuppressWarnings("UseOfSystemOutOrSystemErr")
 public class BuildMain {
+  private static final String PRELOAD_PROJECT_PATH = "preload.project.path";
+  private static final String PRELOAD_CONFIG_PATH = "preload.config.path";
+  
   private static final String LOG_CONFIG_FILE_NAME = "build-log.xml";
   private static final String LOG_FILE_NAME = "build.log";
   private static final String DEFAULT_LOGGER_CONFIG = "defaultLogConfig.xml";
@@ -65,19 +72,10 @@ public class BuildMain {
   private static final int SYSTEM_DIR_ARG = SESSION_ID_ARG + 1;
 
   private static NioEventLoopGroup ourEventLoopGroup;
+  @Nullable 
+  private static PreloadedData ourPreloadedData;
 
   public static void main(String[] args){
-    final long start = System.nanoTime();
-    Runtime.getRuntime().addShutdownHook(new Thread("TimeLogger"){
-      public void run() {
-        final long totalTime = (System.nanoTime() - start) / 1000000L;
-
-        final long millis = totalTime % 1000L ;
-        final long seconds = totalTime / 1000L;
-
-        LOG.info("Total build time " + seconds + " sec " + millis + " ms");
-      }
-    });
     System.out.println("Build process started. Classpath: " + System.getProperty("java.class.path"));
     final String host = args[HOST_ARG];
     final int port = Integer.parseInt(args[PORT_ARG]);
@@ -123,6 +121,56 @@ public class BuildMain {
     final ChannelFuture future = bootstrap.connect(new InetSocketAddress(host, port)).awaitUninterruptibly();
     final boolean success = future.isSuccess();
     if (success) {
+      final String projectPathToPreload = System.getProperty(PRELOAD_PROJECT_PATH, null);
+      final String globalsPathToPreload = System.getProperty(PRELOAD_CONFIG_PATH, null); 
+      if (projectPathToPreload != null && globalsPathToPreload != null) {
+        final PreloadedData data = new PreloadedData();
+        ourPreloadedData = data;
+        try {
+          final BuildRunner runner = new BuildRunner(new JpsModelLoaderImpl(projectPathToPreload, globalsPathToPreload, null));
+          data.setRunner(runner);
+
+          final File dataStorageRoot = Utils.getDataStorageRoot(projectPathToPreload);
+          final BuildFSState fsState = new BuildFSState(false);
+          final ProjectDescriptor pd = runner.load(new MessageHandler() {
+            @Override
+            public void processMessage(BuildMessage msg) {
+              data.addMessage(msg);
+            }
+          }, dataStorageRoot, fsState);
+          data.setProjectDescriptor(pd);
+          
+          try {
+            final File fsStateFile = new File(dataStorageRoot, BuildSession.FS_STATE_FILE);
+            final DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(fsStateFile)));
+            try {
+              final int version = in.readInt();
+              if (version == FSState.VERSION) {
+                final long savedOrdinal = in.readLong();
+                in.readBoolean(); // must skip "has-work-to-do" flag
+                fsState.load(in, pd.getModel(), pd.getBuildRootIndex());
+                data.setFsEventOrdinal(savedOrdinal);
+              }
+            }
+            finally {
+              in.close();
+            }
+          }
+          catch (FileNotFoundException ignored) {
+          }
+          catch (IOException e) {
+            LOG.info("Error pre-loading FS state", e);
+            fsState.clearAll();
+          }
+        }
+        catch (Throwable e) {
+          LOG.info("Failed to pre-load project " + projectPathToPreload, e);
+          // just failed to preload the project, the situation will be handled later, when real build starts  
+        }
+      }
+      else if (projectPathToPreload != null || globalsPathToPreload != null){
+        LOG.info("Skipping project pre-loading step: both paths to project configuration files and path to global settings must be specified");
+      }
       future.channel().writeAndFlush(CmdlineProtoUtil.toMessage(sessionId, CmdlineProtoUtil.createParamRequest()));
     }
     else {
@@ -159,7 +207,7 @@ public class BuildMain {
           case BUILD_PARAMETERS: {
             if (mySession == null) {
               final CmdlineRemoteProto.Message.ControllerMessage.FSEvent delta = controllerMessage.hasFsEvent()? controllerMessage.getFsEvent() : null;
-              final BuildSession session = new BuildSession(mySessionId, channel, controllerMessage.getParamsMessage(), delta);
+              final BuildSession session = new BuildSession(mySessionId, channel, controllerMessage.getParamsMessage(), delta, ourPreloadedData);
               mySession = session;
               SharedThreadPool.getInstance().executeOnPooledThread(new Runnable() {
                 @Override
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java
index a03c127af2c6..1b893a45a302 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java
@@ -58,14 +58,20 @@ public class BuildRunner {
   public static final boolean PARALLEL_BUILD_ENABLED = Boolean.parseBoolean(System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false"));
   private static final boolean STORE_TEMP_CACHES_IN_MEMORY = PARALLEL_BUILD_ENABLED || Boolean.valueOf(System.getProperty(GlobalOptions.USE_MEMORY_TEMP_CACHE_OPTION, "true"));
   private final JpsModelLoader myModelLoader;
-  private final List<String> myFilePaths;
-  private final Map<String, String> myBuilderParams;
+  private List<String> myFilePaths = Collections.emptyList();
+  private Map<String, String> myBuilderParams = Collections.emptyMap();
   private boolean myForceCleanCaches;
 
-  public BuildRunner(JpsModelLoader modelLoader, List<String> filePaths, Map<String, String> builderParams) {
+  public BuildRunner(JpsModelLoader modelLoader) {
     myModelLoader = modelLoader;
-    myFilePaths = filePaths;
-    myBuilderParams = builderParams;
+  }
+
+  public void setFilePaths(List<String> filePaths) {
+    myFilePaths = filePaths != null? filePaths : Collections.<String>emptyList();
+  }
+
+  public void setBuilderParams(Map<String, String> builderParams) {
+    myBuilderParams = builderParams != null? builderParams : Collections.<String, String>emptyMap();
   }
 
   public ProjectDescriptor load(MessageHandler msgHandler, File dataStorageRoot, BuildFSState fsState) throws IOException {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
index 9dd87443eae0..0fc6039dfb90 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.concurrency.SequentialTaskExecutor;
 import com.intellij.util.io.DataOutputStream;
 import io.netty.channel.Channel;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.TimingLog;
 import org.jetbrains.jps.api.*;
@@ -57,9 +58,11 @@ import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage
 */
 final class BuildSession implements Runnable, CanceledStatus {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession");
-  private static final String FS_STATE_FILE = "fs_state.dat";
+  public static final String FS_STATE_FILE = "fs_state.dat";
   private final UUID mySessionId;
   private final Channel myChannel;
+  @Nullable 
+  private final PreloadedData myPreloadedData;
   private volatile boolean myCanceled = false;
   private final String myProjectPath;
   @Nullable
@@ -70,6 +73,7 @@ final class BuildSession implements Runnable, CanceledStatus {
   private volatile ProjectDescriptor myProjectDescriptor;
   private final Map<Pair<String, String>, ConstantSearchFuture> mySearchTasks = Collections.synchronizedMap(new HashMap<Pair<String, String>, ConstantSearchFuture>());
   private final ConstantSearch myConstantSearch = new ConstantSearch();
+  @NotNull
   private final BuildRunner myBuildRunner;
   private final boolean myForceModelLoading;
   private final BuildType myBuildType;
@@ -78,24 +82,31 @@ final class BuildSession implements Runnable, CanceledStatus {
   BuildSession(UUID sessionId,
                Channel channel,
                CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage params,
-               @Nullable CmdlineRemoteProto.Message.ControllerMessage.FSEvent delta) {
+               @Nullable CmdlineRemoteProto.Message.ControllerMessage.FSEvent delta, @Nullable PreloadedData preloaded) {
     mySessionId = sessionId;
     myChannel = channel;
-
+    myPreloadedData = preloaded;
+    
     final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings globals = params.getGlobalSettings();
     myProjectPath = FileUtil.toCanonicalPath(params.getProjectId());
     String globalOptionsPath = FileUtil.toCanonicalPath(globals.getGlobalOptionsPath());
     myBuildType = convertCompileType(params.getBuildType());
     myScopes = params.getScopeList();
     List<String> filePaths = params.getFilePathList();
-    Map<String, String> builderParams = new HashMap<String, String>();
+    final Map<String, String> builderParams = new HashMap<String, String>();
     for (CmdlineRemoteProto.Message.KeyValuePair pair : params.getBuilderParameterList()) {
       builderParams.put(pair.getKey(), pair.getValue());
     }
     myInitialFSDelta = delta;
-    JpsModelLoaderImpl loader = new JpsModelLoaderImpl(myProjectPath, globalOptionsPath, null);
-    myForceModelLoading = Boolean.parseBoolean(builderParams.get(BuildParametersKeys.FORCE_MODEL_LOADING));
-    myBuildRunner = new BuildRunner(loader, filePaths, builderParams);
+    if (preloaded == null || preloaded.getRunner() == null) {
+      myBuildRunner = new BuildRunner(new JpsModelLoaderImpl(myProjectPath, globalOptionsPath, null));
+    }
+    else {
+      myBuildRunner = preloaded.getRunner();
+    }
+    myBuildRunner.setFilePaths(filePaths);
+    myBuildRunner.setBuilderParams(builderParams);
+    myForceModelLoading = (preloaded != null && preloaded.getProjectDescriptor() != null) || Boolean.parseBoolean(builderParams.get(BuildParametersKeys.FORCE_MODEL_LOADING));
   }
 
   @Override
@@ -185,8 +196,9 @@ final class BuildSession implements Runnable, CanceledStatus {
       // invoked the very first time for this project
       myBuildRunner.setForceCleanCaches(true);
     }
-
-    final DataInputStream fsStateStream = createFSDataStream(dataStorageRoot);
+    final ProjectDescriptor preloadedProject = myPreloadedData != null? myPreloadedData.getProjectDescriptor() : null;
+    final DataInputStream fsStateStream = 
+      preloadedProject != null || myInitialFSDelta == null /*this will force FS rescan*/? null : createFSDataStream(dataStorageRoot, myInitialFSDelta.getOrdinal());
 
     if (fsStateStream != null) {
       // optimization: check whether we can skip the build
@@ -198,27 +210,56 @@ final class BuildSession implements Runnable, CanceledStatus {
       }
     }
 
-    final BuildFSState fsState = new BuildFSState(false);
+    final BuildFSState fsState = preloadedProject != null? preloadedProject.fsState : new BuildFSState(false);
     try {
-      final ProjectDescriptor pd = myBuildRunner.load(msgHandler, dataStorageRoot, fsState);
-      TimingLog.LOG.debug("Project descriptor loaded");
-      myProjectDescriptor = pd;
-      if (fsStateStream != null) {
-        try {
-          try {
-            fsState.load(fsStateStream, pd.getModel(), pd.getBuildRootIndex());
-            applyFSEvent(pd, myInitialFSDelta, false);
-            TimingLog.LOG.debug("FS Delta loaded");
-          }
-          finally {
-            fsStateStream.close();
+      final ProjectDescriptor pd;
+      if (preloadedProject != null) {
+        pd = preloadedProject;
+        final List<BuildMessage> preloadMessages = myPreloadedData.getLoadMessages();
+        if (!preloadMessages.isEmpty()) {
+          // replay preload-time messages, so that they are delivered to the IDE
+          for (BuildMessage message : preloadMessages) {
+            msgHandler.processMessage(message);
           }
         }
-        catch (Throwable e) {
-          LOG.error(e);
-          fsState.clearAll();
+        if (myInitialFSDelta == null || myPreloadedData.getFsEventOrdinal() + 1L != myInitialFSDelta.getOrdinal()) {
+          // FS rescan was forced
+          fsState.clearAll(); 
+        }
+        else {
+          // apply events to already loaded state
+          try {
+            applyFSEvent(pd, myInitialFSDelta, false);
+          }
+          catch (Throwable e) {
+            LOG.error(e);
+            fsState.clearAll();
+          }
         }
       }
+      else {
+        // standard case
+        pd = myBuildRunner.load(msgHandler, dataStorageRoot, fsState);
+        TimingLog.LOG.debug("Project descriptor loaded");
+        if (fsStateStream != null) {
+          try {
+            try {
+              fsState.load(fsStateStream, pd.getModel(), pd.getBuildRootIndex());
+              applyFSEvent(pd, myInitialFSDelta, false);
+              TimingLog.LOG.debug("FS Delta loaded");
+            }
+            finally {
+              fsStateStream.close();
+            }
+          }
+          catch (Throwable e) {
+            LOG.error(e);
+            fsState.clearAll();
+          }
+        }
+      }
+      myProjectDescriptor = pd;
+      
       myLastEventOrdinal = myInitialFSDelta != null? myInitialFSDelta.getOrdinal() : 0L;
 
       // free memory
@@ -469,11 +510,7 @@ final class BuildSession implements Runnable, CanceledStatus {
   }
 
   @Nullable
-  private DataInputStream createFSDataStream(File dataStorageRoot) {
-    if (myInitialFSDelta == null) {
-      // this will force FS rescan
-      return null;
-    }
+  private static DataInputStream createFSDataStream(File dataStorageRoot, final long currentEventOrdinal) {
     try {
       final File file = new File(dataStorageRoot, FS_STATE_FILE);
       byte[] bytes;
@@ -490,7 +527,7 @@ final class BuildSession implements Runnable, CanceledStatus {
         return null;
       }
       final long savedOrdinal = in.readLong();
-      if (savedOrdinal + 1L != myInitialFSDelta.getOrdinal()) {
+      if (savedOrdinal + 1L != currentEventOrdinal) {
         return null;
       }
       return in;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/PreloadedData.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/PreloadedData.java
new file mode 100644
index 000000000000..bf5ece5d6fdd
--- /dev/null
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/PreloadedData.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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 org.jetbrains.jps.cmdline;
+
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jps.incremental.messages.BuildMessage;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Eugene Zhuravlev
+ *         Date: 22-Oct-14
+ */
+public class PreloadedData {
+  @Nullable 
+  private BuildRunner runner;
+  @Nullable
+  private ProjectDescriptor projectDescriptor;
+  
+  private final List<BuildMessage> loadMessages = new ArrayList<BuildMessage>();
+  
+  private long fsEventOrdinal;
+
+  @Nullable
+  public BuildRunner getRunner() {
+    return runner;
+  }
+
+  public void setRunner(@Nullable BuildRunner runner) {
+    this.runner = runner;
+  }
+
+  @Nullable
+  public ProjectDescriptor getProjectDescriptor() {
+    return projectDescriptor;
+  }
+
+  public void setProjectDescriptor(@Nullable ProjectDescriptor projectDescriptor) {
+    this.projectDescriptor = projectDescriptor;
+  }
+
+  public long getFsEventOrdinal() {
+    return fsEventOrdinal;
+  }
+
+  public void setFsEventOrdinal(long fsEventOrdinal) {
+    this.fsEventOrdinal = fsEventOrdinal;
+  }
+
+  public List<BuildMessage> getLoadMessages() {
+    return loadMessages;
+  }
+  
+  public void addMessage(BuildMessage msg) {
+    loadMessages.add(msg);
+  }
+}
diff --git a/jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java b/jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java
index 979fd78703f1..7b7d425f1a09 100644
--- a/jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java
+++ b/jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java
@@ -193,8 +193,7 @@ public class Standalone {
 
   public static void runBuild(JpsModelLoader loader, File dataStorageRoot, MessageHandler messageHandler, List<TargetTypeBuildScope> scopes,
                               boolean includeDependenciesToScope) throws Exception {
-    final BuildRunner buildRunner = new BuildRunner(loader, Collections.<String>emptyList(), Collections.<String, String>emptyMap()
-    );
+    final BuildRunner buildRunner = new BuildRunner(loader);
     ProjectDescriptor descriptor = buildRunner.load(messageHandler, dataStorageRoot, new BuildFSState(true));
     try {
       buildRunner.runBuild(descriptor, CanceledStatus.NULL, null, messageHandler, BuildType.BUILD, scopes, includeDependenciesToScope);
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index e5be37cd7b30..5c559a09fb55 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -198,6 +198,9 @@ compiler.process.use.memory.temp.cache=true
 compiler.process.use.memory.temp.cache.description=Store temporary data in memory for faster compilation;\
    requires larger heap size for the build process. If parallel build is enabled, the option is ignored and temp data is always stored in memory.
 
+compiler.process.preload=false
+compiler.process.preload.description=After build finishes, the IDE will pre-load and leave waiting in memory the build process for the next compilation. This will save time for process start and project model loading (may be noticeable for big projects).\
+   
 compiler.process.debug.port=-1
 
 compiler.automake.trigger.delay=300

From a2595d6960aaf06e853acf2b1dcf4939d7d7186d Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Mon, 27 Oct 2014 10:20:32 +0100
Subject: [PATCH 062/132] once preloaded process has been started, it should be
 used by the next compile session (incomplete)

---
 .../intellij/compiler/impl/CompileDriver.java |  9 +-
 .../compiler/server/BuildManager.java         | 68 ++++++++++-----
 .../server/BuildMessageDispatcher.java        | 83 +++++++++++--------
 3 files changed, 97 insertions(+), 63 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index a35a03630ad9..d4a69206c3ba 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -71,9 +71,9 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
+import org.jetbrains.jps.api.BasicFuture;
 import org.jetbrains.jps.api.CmdlineProtoUtil;
 import org.jetbrains.jps.api.CmdlineRemoteProto;
-import org.jetbrains.jps.api.RequestFuture;
 import org.jetbrains.jps.model.java.JavaSourceRootType;
 
 import javax.swing.*;
@@ -138,7 +138,7 @@ public class CompileDriver {
           return;
         }
         try {
-          final RequestFuture future = compileInExternalProcess(compileContext, true);
+          final BasicFuture future = compileInExternalProcess(compileContext, true);
           if (future != null) {
             while (!future.waitFor(200L, TimeUnit.MILLISECONDS)) {
               if (indicator.isCanceled()) {
@@ -194,7 +194,7 @@ public class CompileDriver {
   }
 
   @Nullable
-  private RequestFuture compileInExternalProcess(final @NotNull CompileContextImpl compileContext, final boolean onlyCheckUpToDate)
+  private BasicFuture compileInExternalProcess(final @NotNull CompileContextImpl compileContext, final boolean onlyCheckUpToDate)
     throws Exception {
     final CompileScope scope = compileContext.getCompileScope();
     final Collection<String> paths = CompileScopeUtil.fetchFiles(compileContext);
@@ -400,7 +400,7 @@ public class CompileDriver {
             return;
           }
 
-          final RequestFuture future = compileInExternalProcess(compileContext, false);
+          final BasicFuture future = compileInExternalProcess(compileContext, false);
           if (future != null) {
             while (!future.waitFor(200L, TimeUnit.MILLISECONDS)) {
               if (indicator.isCanceled()) {
@@ -646,7 +646,6 @@ public class CompileDriver {
       final Module[] scopeModules = scope.getAffectedModules();
       final List<String> modulesWithoutOutputPathSpecified = new ArrayList<String>();
       final List<String> modulesWithoutJdkAssigned = new ArrayList<String>();
-      final CompilerConfiguration config = CompilerConfiguration.getInstance(myProject);
       final CompilerManager compilerManager = CompilerManager.getInstance(myProject);
       for (final Module module : scopeModules) {
         if (!compilerManager.isValidationEnabled(module)) {
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index 23dc33a9b627..2c5b378d96ea 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -148,7 +148,7 @@ public class BuildManager implements ApplicationComponent{
   private final File mySystemDirectory;
   private final ProjectManager myProjectManager;
 
-  private final Map<RequestFuture, Project> myAutomakeFutures = Collections.synchronizedMap(new HashMap<RequestFuture, Project>());
+  private final Map<BasicFuture, Project> myAutomakeFutures = Collections.synchronizedMap(new HashMap<BasicFuture, Project>());
   private final Map<String, RequestFuture> myBuildsInProgress = Collections.synchronizedMap(new HashMap<String, RequestFuture>());
   private final Map<String, Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>> myPreloadedBuilds = 
     Collections.synchronizedMap(new HashMap<String, Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>>());
@@ -447,7 +447,7 @@ public class BuildManager implements ApplicationComponent{
     }
     final List<TargetTypeBuildScope> scopes = CmdlineProtoUtil.createAllModulesScopes(false);
     final AutoMakeMessageHandler handler = new AutoMakeMessageHandler(project);
-    final RequestFuture future = scheduleBuild(
+    final BasicFuture future = scheduleBuild(
       project, false, true, false, scopes, Collections.<String>emptyList(), Collections.<String, String>emptyMap(), handler
     );
     if (future != null) {
@@ -526,12 +526,12 @@ public class BuildManager implements ApplicationComponent{
     return false;
   }
 
-  public Collection<RequestFuture> cancelAutoMakeTasks(Project project) {
-    final Collection<RequestFuture> futures = new SmartList<RequestFuture>();
+  public Collection<BasicFuture> cancelAutoMakeTasks(Project project) {
+    final Collection<BasicFuture> futures = new SmartList<BasicFuture>();
     synchronized (myAutomakeFutures) {
-      for (Map.Entry<RequestFuture, Project> entry : myAutomakeFutures.entrySet()) {
+      for (Map.Entry<BasicFuture, Project> entry : myAutomakeFutures.entrySet()) {
         if (entry.getValue().equals(project)) {
-          final RequestFuture future = entry.getKey();
+          final BasicFuture future = entry.getKey();
           future.cancel(false);
           futures.add(future);
         }
@@ -540,17 +540,30 @@ public class BuildManager implements ApplicationComponent{
     return futures;
   }
 
-  private String cancelPreloadedBuilds(Project project) {
+  private void cancelPreloadedBuilds(Project project) {
     final String projectPath = getProjectPath(project);
     final Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> pair = myPreloadedBuilds.remove(projectPath);
     if (pair != null) {
-      myMessageDispatcher.cancelSession(pair.first.getRequestID());
+      final RequestFuture<PreloadedProcessMessageHandler> future = pair.first;
+      myMessageDispatcher.cancelSession(future.getRequestID());
+      runCommand(new Runnable() {
+        @Override
+        public void run() {
+          // waiting for preloaded process from project's task queue guarantees no build is started for this project
+          // until this one gracefully exits and closes all its storages 
+          getProjectData(projectPath).taskQueue.submit(new Runnable() {
+            @Override
+            public void run() {
+              future.waitFor();
+            }
+          });
+        }
+      });
     }
-    return projectPath;
   }
 
   @Nullable
-  public RequestFuture scheduleBuild(
+  public BasicFuture scheduleBuild(
     final Project project, final boolean isRebuild, final boolean isMake,
     final boolean onlyCheckUpToDate, final List<TargetTypeBuildScope> scopes,
     final Collection<String> paths,
@@ -558,9 +571,9 @@ public class BuildManager implements ApplicationComponent{
 
     final String projectPath = getProjectPath(project);
 
-    final Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> preloaded = myPreloadedBuilds.get(projectPath);
+    final Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> preloaded = myPreloadedBuilds.remove(projectPath);
     final RequestFuture<PreloadedProcessMessageHandler> preloadedFuture = preloaded != null? preloaded.first : null;
-    final boolean usingPreloadedProcess = preloadedFuture != null && myMessageDispatcher.acquirePreloadedSessionIfReady(preloadedFuture.getRequestID());
+    final boolean usingPreloadedProcess = preloadedFuture != null;
     
     final UUID sessionId;
     final BuilderMessageHandler handler = new NotifyingMessageHandler(project, messageHandler, messageHandler instanceof AutoMakeMessageHandler);
@@ -568,7 +581,6 @@ public class BuildManager implements ApplicationComponent{
       LOG.info("Using preloaded build process to compile " + projectPath);
       sessionId = preloadedFuture.getRequestID();
       preloadedFuture.getMessageHandler().setDelegateHandler(handler);
-      myPreloadedBuilds.remove(projectPath);
     }
     else {
       sessionId = UUID.randomUUID();
@@ -607,11 +619,7 @@ public class BuildManager implements ApplicationComponent{
           CmdlineRemoteProto.Message.ControllerMessage.FSEvent currentFSChanges;
           final SequentialTaskExecutor projectTaskQueue;
           synchronized (myProjectDataMap) {
-            ProjectData data = myProjectDataMap.get(projectPath);
-            if (data == null) {
-              data = new ProjectData(new SequentialTaskExecutor(PooledThreadExecutor.INSTANCE));
-              myProjectDataMap.put(projectPath, data);
-            }
+            final ProjectData data = getProjectData(projectPath);
             if (isRebuild) {
               data.dropChanges();
             }
@@ -659,7 +667,10 @@ public class BuildManager implements ApplicationComponent{
                   final OSProcessHandler processHandler;
                   final StringBuilder errorsOnLaunch = new StringBuilder();
                   if (usingPreloadedProcess) {
-                    myMessageDispatcher.sendBuildParameters(future.getRequestID(), params);
+                    final boolean paramsSent = myMessageDispatcher.sendBuildParameters(future.getRequestID(), params);
+                    if (!paramsSent) {
+                      myMessageDispatcher.cancelSession(future.getRequestID());
+                    }
                     processHandler = preloaded.second;
                   }
                   else {
@@ -716,7 +727,7 @@ public class BuildManager implements ApplicationComponent{
                     }
                   }
 
-                  if (Registry.is("compiler.process.preload") && !myPreloadedBuilds.containsKey(projectPath) && !project.isDisposed()) {
+                  if (Registry.is("compiler.process.preload") && !project.isDisposed()) {
                     try {
                       final Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> pair = launchPreloadedBuildProcess(project);
                       myPreloadedBuilds.put(projectPath, pair);
@@ -750,6 +761,18 @@ public class BuildManager implements ApplicationComponent{
     return null;
   }
 
+  @NotNull
+  private ProjectData getProjectData(String projectPath) {
+    synchronized (myProjectDataMap) {
+      ProjectData data = myProjectDataMap.get(projectPath);
+      if (data == null) {
+        data = new ProjectData(new SequentialTaskExecutor(PooledThreadExecutor.INSTANCE));
+        myProjectDataMap.put(projectPath, data);
+      }
+      return data;
+    }
+  }
+
   private void ensureListening() throws Exception {
     if (myListenPort < 0) {
       synchronized (this) {
@@ -1277,7 +1300,7 @@ public class BuildManager implements ApplicationComponent{
     @Override
     public void projectClosing(Project project) {
       cancelPreloadedBuilds(project);
-      for (RequestFuture future : cancelAutoMakeTasks(project)) {
+      for (BasicFuture future : cancelAutoMakeTasks(project)) {
         future.waitFor(500, TimeUnit.MILLISECONDS);
       }
     }
@@ -1293,13 +1316,14 @@ public class BuildManager implements ApplicationComponent{
   }
 
   private static class ProjectData {
+    @NotNull
     final SequentialTaskExecutor taskQueue;
     private final Set<InternedPath> myChanged = new THashSet<InternedPath>();
     private final Set<InternedPath> myDeleted = new THashSet<InternedPath>();
     private long myNextEventOrdinal = 0L;
     private boolean myNeedRescan = true;
 
-    private ProjectData(SequentialTaskExecutor taskQueue) {
+    private ProjectData(@NotNull SequentialTaskExecutor taskQueue) {
       this.taskQueue = taskQueue;
     }
 
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
index 7ee922211e57..59c19f0ad7fe 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
@@ -95,20 +95,30 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
     return data != null? data.channel : null;
   }
 
-  public boolean acquirePreloadedSessionIfReady(final UUID sessionId) {
-    final SessionData data = mySessionDescriptors.get(sessionId);
-    return data != null && data.getAndClearWaitingFlag();
-  }
-  
-  public void sendBuildParameters(final UUID preloadedSessionId, CmdlineRemoteProto.Message.ControllerMessage params) {
+  public boolean sendBuildParameters(@NotNull final UUID preloadedSessionId, @NotNull CmdlineRemoteProto.Message.ControllerMessage params) {
+    boolean succeeded = false;
     final SessionData sessionData = mySessionDescriptors.get(preloadedSessionId);
     if (sessionData != null) {
-      final Channel channel = sessionData.channel;
-      if (channel != null && channel.isActive() && sessionData.handler != null) {
-        sessionData.handler.buildStarted(preloadedSessionId);
-        channel.writeAndFlush(CmdlineProtoUtil.toMessage(preloadedSessionId, params));
+      //noinspection SynchronizationOnLocalVariableOrMethodParameter
+      synchronized (sessionData) {
+        if (sessionData.state == SessionData.State.WAITING_PARAMS) {
+          sessionData.state = SessionData.State.RUNNING;
+          final Channel channel = sessionData.channel;
+          if (channel != null && channel.isActive()) {
+            sessionData.handler.buildStarted(preloadedSessionId);
+            channel.writeAndFlush(CmdlineProtoUtil.toMessage(preloadedSessionId, params));
+            succeeded = true;
+          }
+        }
+        else {
+          if (sessionData.state == SessionData.State.INITIAL) {
+            sessionData.params = params;
+            succeeded = true;
+          }
+        }
       }
     }
+    return succeeded;
   }
   
   @Override
@@ -151,16 +161,25 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
         final CmdlineRemoteProto.Message.BuilderMessage builderMessage = message.getBuilderMessage();
         final CmdlineRemoteProto.Message.BuilderMessage.Type msgType = builderMessage.getType();
         if (msgType == CmdlineRemoteProto.Message.BuilderMessage.Type.PARAM_REQUEST) {
-          final CmdlineRemoteProto.Message.ControllerMessage params = sessionData.params;
-          if (params != null) {
-            handler.buildStarted(sessionId);
-            sessionData.params = null;
-            context.writeAndFlush(CmdlineProtoUtil.toMessage(sessionId, params));
-          }
-          else if (!sessionData.setReadyAndWaiting()) {
-            // this message is expected to be sent only once.
-            // To be on the safe side, cancel the session
-            cancelSession(sessionId);
+          //noinspection SynchronizationOnLocalVariableOrMethodParameter
+          synchronized (sessionData) {
+            final CmdlineRemoteProto.Message.ControllerMessage params = sessionData.params;
+            if (params != null) {
+              sessionData.state = SessionData.State.RUNNING;
+              handler.buildStarted(sessionId);
+              sessionData.params = null;
+              context.writeAndFlush(CmdlineProtoUtil.toMessage(sessionId, params));
+            }
+            else {
+              if (sessionData.state == SessionData.State.INITIAL) {
+                sessionData.state = SessionData.State.WAITING_PARAMS;
+              }
+              else {
+                // this message is expected to be sent only once.
+                // To be on the safe side, cancel the session
+                cancelSession(sessionId);
+              }
+            }
           }
         }
         else {
@@ -199,30 +218,22 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
   }
 
   private static final class SessionData {
+    enum State {
+      INITIAL, WAITING_PARAMS, RUNNING
+    }
+    
+    @NotNull
     final UUID sessionId;
+    @NotNull
     final BuilderMessageHandler handler;
     volatile CmdlineRemoteProto.Message.ControllerMessage params;
     volatile Channel channel;
-    private boolean isReadyAndWaiting = false;
+    State state = State.INITIAL;
 
-    private SessionData(UUID sessionId, BuilderMessageHandler handler, CmdlineRemoteProto.Message.ControllerMessage params) {
+    private SessionData(@NotNull UUID sessionId, @NotNull BuilderMessageHandler handler, CmdlineRemoteProto.Message.ControllerMessage params) {
       this.sessionId = sessionId;
       this.handler = handler;
       this.params = params;
     }
-
-    public synchronized boolean setReadyAndWaiting() {
-      if (!isReadyAndWaiting) {
-        isReadyAndWaiting = true;
-        return true;
-      }
-      return false;
-    }
-    
-    public synchronized boolean getAndClearWaitingFlag() {
-      final boolean wasWaiting = isReadyAndWaiting;
-      isReadyAndWaiting = false;
-      return wasWaiting;
-    }
   }
 }

From c0137a29ea2c79d24f6d9dd152854e37abca0568 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Mon, 27 Oct 2014 11:00:33 +0100
Subject: [PATCH 063/132] inline debugger: better fg colors for execution line

---
 .../impl/evaluate/XDebuggerEditorLinePainter.java          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEditorLinePainter.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEditorLinePainter.java
index cce3eac58098..a71b6ec5de7a 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEditorLinePainter.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEditorLinePainter.java
@@ -26,7 +26,10 @@ import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.*;
+import com.intellij.ui.ColorUtil;
+import com.intellij.ui.JBColor;
+import com.intellij.ui.SimpleColoredText;
+import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.util.NotNullProducer;
 import com.intellij.xdebugger.XDebugSession;
 import com.intellij.xdebugger.XSourcePosition;
@@ -95,7 +98,7 @@ public class XDebuggerEditorLinePainter extends EditorLinePainter {
         catch (Exception e) {
           continue;
         }
-        final Color color = bpLine == lineNumber ? new JBColor(Gray._180, new Color(147, 217, 186)) : getForeground();
+        final Color color = bpLine == lineNumber ? new JBColor(new Color(0, 255, 86), new Color(255, 235, 9)) : getForeground();
 
         final String name = value.getName();
         if (StringUtil.isEmpty(text.toString())) {

From 78986b3fa807a7f03c0214497ab31e7a55d1d4a9 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Mon, 27 Oct 2014 11:03:27 +0100
Subject: [PATCH 064/132] Inline debugger: better fg colors for Darcula

---
 platform/util/resources/misc/registry.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 5c559a09fb55..7d9390c705e3 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -47,11 +47,11 @@ ide.debugger.inline=true
 ide.debugger.inline.description=Enables variables view in editor
 ide.debugger.inline.fg.color=134,134,134
 ide.debugger.inline.fg.color.description=Inline values foreground
-ide.debugger.inline.dark.fg.color=61,128,101
+ide.debugger.inline.dark.fg.color=62,179,151
 ide.debugger.inline.dark.fg.color.description=Inline values foreground for dark editor scheme
 ide.debugger.inline.fg.modified.color=202,128,33
 ide.debugger.inline.fg.modified.color.description=Inline modified values foreground
-ide.debugger.inline.dark.fg.modified.color=161,131,10
+ide.debugger.inline.dark.fg.modified.color=202,126,3
 ide.debugger.inline.dark.fg.modified.color.description=Inline modified values foreground for dark editor scheme
 
 ide.debugMode.description=Record additional information to make bug reports more informative.

From 18de0b042cb574d6c5c085f585dbdc33ef6f1d5c Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Mon, 27 Oct 2014 11:04:31 +0100
Subject: [PATCH 065/132] inline debugger: show values at declaration and at
 nearest to execution point lines

---
 .../xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java
index 7020c9a5cf84..6f911b28cd68 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java
@@ -160,10 +160,11 @@ public class XValueNodeImpl extends XValueContainerNode<XValue> implements XValu
           };
 
           if (getValueContainer().computeInlineDebuggerData(callback) == ThreeState.UNSURE) {
-            getValueContainer().computeSourcePosition(new XNearestSourcePosition() {
+            class ValueDeclaration implements XNavigatable {
               @Override
               public void setSourcePosition(@Nullable XSourcePosition sourcePosition) {
-                final Map<Pair<VirtualFile, Integer>, Set<XValueNodeImpl>> map = myTree.getProject().getUserData(XVariablesView.DEBUG_VARIABLES);
+                final Map<Pair<VirtualFile, Integer>, Set<XValueNodeImpl>> map =
+                  myTree.getProject().getUserData(XVariablesView.DEBUG_VARIABLES);
                 final Map<VirtualFile, Long> timestamps = myTree.getProject().getUserData(XVariablesView.DEBUG_VARIABLES_TIMESTAMPS);
                 if (map == null || timestamps == null || sourcePosition == null) return;
                 VirtualFile file = sourcePosition.getFile();
@@ -172,7 +173,10 @@ public class XValueNodeImpl extends XValueContainerNode<XValue> implements XValu
                 int line = sourcePosition.getLine();
                 callback.computed(file, doc, line);
               }
-            });
+            }
+            class NearestValuePosition extends ValueDeclaration implements XNearestSourcePosition {}
+            getValueContainer().computeSourcePosition(new ValueDeclaration());
+            getValueContainer().computeSourcePosition(new NearestValuePosition());
           }
         }
       }

From e3faaf04429a1d8a0f3b6c4e136d76f68e2fc04e Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Mon, 27 Oct 2014 13:36:39 +0300
Subject: [PATCH 066/132] PY-13297 Move caret on the line after inserted
 comment with encoding declaration

Append empty line if inserted comment is on the last line in document.
---
 .../quickfix/AddEncodingQuickFix.java         | 35 +++++++++++++++----
 .../inspections/AddEncodingInEmptyFile.py     |  1 +
 .../AddEncodingInEmptyFile_after.py           |  2 ++
 .../testData/inspections/AddEncoding_after.py |  2 +-
 .../com/jetbrains/python/PyQuickFixTest.java  |  9 ++++-
 5 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 python/testData/inspections/AddEncodingInEmptyFile.py
 create mode 100644 python/testData/inspections/AddEncodingInEmptyFile_after.py

diff --git a/python/src/com/jetbrains/python/inspections/quickfix/AddEncodingQuickFix.java b/python/src/com/jetbrains/python/inspections/quickfix/AddEncodingQuickFix.java
index 8b65e34ad3ca..82f61cfb1b57 100644
--- a/python/src/com/jetbrains/python/inspections/quickfix/AddEncodingQuickFix.java
+++ b/python/src/com/jetbrains/python/inspections/quickfix/AddEncodingQuickFix.java
@@ -17,8 +17,15 @@ package com.jetbrains.python.inspections.quickfix;
 
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.LogicalPosition;
+import com.intellij.openapi.fileEditor.FileEditor;
+import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.fileEditor.TextEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiComment;
+import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.jetbrains.python.PyBundle;
@@ -32,13 +39,13 @@ import org.jetbrains.annotations.NotNull;
  * add missing encoding declaration
  * # -*- coding: <encoding name> -*-
  * to the source file
- *
+ * <p/>
  * User: catherine
  */
 public class AddEncodingQuickFix implements LocalQuickFix {
 
-  private String myDefaultEncoding;
-  private int myEncodingFormatIndex;
+  private final String myDefaultEncoding;
+  private final int myEncodingFormatIndex;
 
   public AddEncodingQuickFix(String defaultEncoding, int encodingFormatIndex) {
     myDefaultEncoding = defaultEncoding;
@@ -57,14 +64,28 @@ public class AddEncodingQuickFix implements LocalQuickFix {
   }
 
   public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor) {
-    PsiFile file = descriptor.getPsiElement().getContainingFile();
+    final PsiElement element = descriptor.getPsiElement();
+    final PsiFile file = element.getContainingFile();
     if (file == null) return;
     PsiElement firstLine = file.getFirstChild();
     if (firstLine instanceof PsiComment && firstLine.getText().startsWith("#!")) {
       firstLine = firstLine.getNextSibling();
     }
-    PsiComment encodingLine = PyElementGenerator.getInstance(project).createFromText(LanguageLevel.forElement(file), PsiComment.class,
-                                                                                     String.format(PyEncodingUtil.ENCODING_FORMAT_PATTERN[myEncodingFormatIndex], myDefaultEncoding));
-    file.addBefore(encodingLine, firstLine);
+    final String commentText = String.format(PyEncodingUtil.ENCODING_FORMAT_PATTERN[myEncodingFormatIndex], myDefaultEncoding);
+    final PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project);
+    PsiComment encodingComment = elementGenerator.createFromText(LanguageLevel.forElement(file), PsiComment.class, commentText);
+    encodingComment = (PsiComment)file.addBefore(encodingComment, firstLine);
+
+    final FileEditor fileEditor = FileEditorManager.getInstance(project).getSelectedEditor(element.getContainingFile().getVirtualFile());
+    if (fileEditor instanceof TextEditor) {
+      final Editor editor = ((TextEditor)fileEditor).getEditor();
+      final Document document = editor.getDocument();
+      final int insertedLineNumber = document.getLineNumber(encodingComment.getTextOffset());
+      if (insertedLineNumber == document.getLineCount() - 1) {
+        PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(document);
+        document.insertString(document.getLineEndOffset(insertedLineNumber), "\n");
+      }
+      editor.getCaretModel().moveToLogicalPosition(new LogicalPosition(insertedLineNumber + 1, 0));
+    }
   }
 }
diff --git a/python/testData/inspections/AddEncodingInEmptyFile.py b/python/testData/inspections/AddEncodingInEmptyFile.py
new file mode 100644
index 000000000000..376db9193fc4
--- /dev/null
+++ b/python/testData/inspections/AddEncodingInEmptyFile.py
@@ -0,0 +1 @@
+<warning descr="No encoding specified for file"><caret></warning>
diff --git a/python/testData/inspections/AddEncodingInEmptyFile_after.py b/python/testData/inspections/AddEncodingInEmptyFile_after.py
new file mode 100644
index 000000000000..76ea4ea7c759
--- /dev/null
+++ b/python/testData/inspections/AddEncodingInEmptyFile_after.py
@@ -0,0 +1,2 @@
+# coding=utf-8
+<caret>
\ No newline at end of file
diff --git a/python/testData/inspections/AddEncoding_after.py b/python/testData/inspections/AddEncoding_after.py
index ef08f90863b7..974d8ff7f054 100644
--- a/python/testData/inspections/AddEncoding_after.py
+++ b/python/testData/inspections/AddEncoding_after.py
@@ -1,2 +1,2 @@
 # coding=utf-8
-c = "string"
+<caret>c = "string"
diff --git a/python/testSrc/com/jetbrains/python/PyQuickFixTest.java b/python/testSrc/com/jetbrains/python/PyQuickFixTest.java
index e49b0eaee6c8..c7e8d138aa83 100644
--- a/python/testSrc/com/jetbrains/python/PyQuickFixTest.java
+++ b/python/testSrc/com/jetbrains/python/PyQuickFixTest.java
@@ -349,11 +349,18 @@ public class PyQuickFixTest extends PyTestCase {
                      PyBundle.message("QFIX.add.super"), true, true);
   }
 
-  public void testAddEncoding() {                      //PY-491
+  //PY-491, PY-13297
+  public void testAddEncoding() {
     doInspectionTest("AddEncoding.py", PyMandatoryEncodingInspection.class,
                      PyBundle.message("QFIX.add.encoding"), true, true);
   }
 
+  // PY-13297
+  public void testAddEncodingInEmptyFile() {
+    doInspectionTest("AddEncodingInEmptyFile.py", PyMandatoryEncodingInspection.class,
+                     PyBundle.message("QFIX.add.encoding"), true, true);
+  }
+
   public void testRemoveDecorator() {                      //PY-3348
     doInspectionTest("RemoveDecorator.py", PyDecoratorInspection.class,
                      PyBundle.message("QFIX.remove.decorator"), true, true);

From f79ce8cc9ee16660f59afc6e601fe9769ef63432 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Mon, 27 Oct 2014 14:10:57 +0400
Subject: [PATCH 067/132] IDEA-106103 XML editor: Allow highlighting of
 different namespace nodes in different colors: XSLT color page

---
 .../src/META-INF/XmlPlugin.xml                |  2 +-
 .../intellij/lang/xpath/xslt/XsltSupport.java |  4 ++
 .../xpath/xslt/validation/XsltColorPage.java  | 61 +++++++++++++++++++
 .../xslt/validation/XsltNSColorProvider.java  | 37 +++++++++++
 .../xpath/xpath-view/src/META-INF/plugin.xml  |  3 +
 5 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltColorPage.java
 create mode 100644 plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltNSColorProvider.java

diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml
index 64f737ce376b..00f42a06cd93 100644
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml
@@ -116,8 +116,8 @@
     <lang.syntaxHighlighterFactory key="XHTML" implementationClass="com.intellij.lang.xhtml.XhtmlSyntaxHighlighterFactory"/>
     <lang.syntaxHighlighterFactory key="DTD" implementationClass="com.intellij.lang.dtd.DtdSyntaxHighlighterFactory"/>
 
-    <annotator language="XML" implementationClass="com.intellij.codeInsight.daemon.impl.analysis.XmlNamespaceAnnotator"/>
     <annotator language="XML" implementationClass="com.intellij.codeInsight.daemon.impl.analysis.XmlNsPrefixAnnotator"/>
+    <annotator language="XML" implementationClass="com.intellij.codeInsight.daemon.impl.analysis.XmlNamespaceAnnotator"/>
 
     <renameHandler id="xmlTagRenameHandler" implementation="com.intellij.xml.refactoring.XmlTagRenameHandler"/>
     <renameHandler implementation="com.intellij.xml.refactoring.SchemaPrefixRenameHandler" order="before xmlTagRenameHandler"/>
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
index 3a412bf3ca8c..68c031cea400 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
@@ -15,6 +15,8 @@
  */
 package org.intellij.lang.xpath.xslt;
 
+import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
+import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiElement;
@@ -47,6 +49,8 @@ public class XsltSupport {
   public static final String XSLT_NS = "http://www.w3.org/1999/XSL/Transform";
   public static final String PLUGIN_EXTENSIONS_NS = "urn:idea:xslt-plugin#extensions";
   public static final Key<ParameterizedCachedValue<XsltChecker.LanguageLevel, PsiFile>> FORCE_XSLT_KEY = Key.create("FORCE_XSLT");
+  public static final TextAttributesKey XSLT_DIRECTIVE =
+    TextAttributesKey.createTextAttributesKey("XSLT_DIRECTIVE", DefaultLanguageHighlighterColors.TEMPLATE_LANGUAGE_COLOR);
 
   private static final Map<String, String> XPATH_ATTR_MAP = new THashMap<String, String>(10);
   private static final Map<String, Set<String>> XPATH_AVT_MAP = new THashMap<String, Set<String>>(10);
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltColorPage.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltColorPage.java
new file mode 100644
index 000000000000..e4f7f43057f0
--- /dev/null
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltColorPage.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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 org.intellij.lang.xpath.xslt.validation;
+
+import com.intellij.openapi.editor.colors.TextAttributesKey;
+import com.intellij.openapi.options.colors.AttributesDescriptor;
+import com.intellij.openapi.options.colors.pages.XMLColorsPage;
+import org.intellij.lang.xpath.xslt.XsltSupport;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * @author Dmitry Avdeev
+ */
+public class XsltColorPage extends XMLColorsPage {
+  @NotNull
+  @Override
+  public String getDisplayName() {
+    return "XSLT";
+  }
+
+  @NotNull
+  @Override
+  public AttributesDescriptor[] getAttributeDescriptors() {
+    return new AttributesDescriptor[] { new AttributesDescriptor("XSLT directive", XsltSupport.XSLT_DIRECTIVE)};
+  }
+
+  @NotNull
+  @Override
+  public String getDemoText() {
+    return "<xsl><xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\"></xsl>\n" +
+           "    <xsl><xsl:template match=\"/hello-world\"></xsl>\n" +
+           "        <html>\n" +
+           "            <body>\n" +
+           "                <xsl><xsl:value-of select=\"greeting\"/></xsl>\n" +
+           "            </body>\n" +
+           "        </html>\n" +
+           "    <xsl></xsl:template></xsl>\n" +
+           "<xsl></xsl:stylesheet></xsl>";
+  }
+
+  @Override
+  public Map<String, TextAttributesKey> getAdditionalHighlightingTagToDescriptorMap() {
+    return Collections.singletonMap("xsl", XsltSupport.XSLT_DIRECTIVE);
+  }
+}
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltNSColorProvider.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltNSColorProvider.java
new file mode 100644
index 000000000000..6687c71e70c2
--- /dev/null
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltNSColorProvider.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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 org.intellij.lang.xpath.xslt.validation;
+
+import com.intellij.codeInsight.daemon.impl.analysis.XmlNSColorProvider;
+import com.intellij.openapi.editor.colors.TextAttributesKey;
+import com.intellij.psi.xml.XmlElement;
+import com.intellij.psi.xml.XmlTag;
+import org.intellij.lang.xpath.xslt.XsltSupport;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Dmitry Avdeev
+ */
+public class XsltNSColorProvider implements XmlNSColorProvider {
+
+  @Nullable
+  @Override
+  public TextAttributesKey getKeyForNamespace(String namespace, XmlElement context) {
+    if (!(context instanceof XmlTag)) return null;
+    if (XsltSupport.XSLT_NS.equals(((XmlTag)context).getNamespace())) return XsltSupport.XSLT_DIRECTIVE;
+    return null;
+  }
+}
diff --git a/plugins/xpath/xpath-view/src/META-INF/plugin.xml b/plugins/xpath/xpath-view/src/META-INF/plugin.xml
index 840cccb76aca..0be80ec48645 100644
--- a/plugins/xpath/xpath-view/src/META-INF/plugin.xml
+++ b/plugins/xpath/xpath-view/src/META-INF/plugin.xml
@@ -145,6 +145,9 @@
     <annotator language="XPath" implementationClass="org.intellij.lang.xpath.xslt.validation.XsltAnnotator"/>
     <annotator language="XML" implementationClass="org.intellij.lang.xpath.xslt.validation.XsltXmlAnnotator"/>
 
+    <xml.nsColorProvider implementation="org.intellij.lang.xpath.xslt.validation.XsltNSColorProvider"/>
+    <colorSettingsPage implementation="org.intellij.lang.xpath.xslt.validation.XsltColorPage"/>
+
     <lang.documentationProvider language="XML" implementationClass="org.intellij.lang.xpath.xslt.impl.XsltDocumentationProvider"/>
     <lang.documentationProvider language="XPath" implementationClass="org.intellij.lang.xpath.xslt.impl.XsltDocumentationProvider"/>
 

From 986a786650469d1181f4a005fe450a5123c1ee7d Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Mon, 27 Oct 2014 14:58:48 +0400
Subject: [PATCH 068/132] DSGN-869 New icons for task management

---
 .../tasks/tasks-core/src/icons/TasksIcons.java  |  10 +++++-----
 plugins/tasks/tasks-core/src/icons/asana.png    | Bin 737 -> 325 bytes
 plugins/tasks/tasks-core/src/icons/asana@2x.png | Bin 0 -> 594 bytes
 plugins/tasks/tasks-core/src/icons/assembla.png | Bin 635 -> 358 bytes
 .../tasks/tasks-core/src/icons/assembla@2x.png  | Bin 0 -> 802 bytes
 plugins/tasks/tasks-core/src/icons/autoMode.png | Bin 397 -> 398 bytes
 .../tasks/tasks-core/src/icons/autoMode@2x.png  | Bin 0 -> 866 bytes
 plugins/tasks/tasks-core/src/icons/bug.png      | Bin 568 -> 471 bytes
 plugins/tasks/tasks-core/src/icons/bug@2x.png   | Bin 0 -> 1210 bytes
 .../tasks/tasks-core/src/icons/bug@2x_dark.png  | Bin 0 -> 1290 bytes
 plugins/tasks/tasks-core/src/icons/bug_dark.png | Bin 0 -> 470 bytes
 plugins/tasks/tasks-core/src/icons/bugzilla.png | Bin 766 -> 775 bytes
 .../tasks/tasks-core/src/icons/bugzilla@2x.png  | Bin 0 -> 1909 bytes
 .../tasks/tasks-core/src/icons/exception.png    | Bin 611 -> 426 bytes
 .../tasks/tasks-core/src/icons/exception@2x.png | Bin 0 -> 862 bytes
 plugins/tasks/tasks-core/src/icons/feature.png  | Bin 649 -> 472 bytes
 .../tasks/tasks-core/src/icons/feature@2x.png   | Bin 0 -> 965 bytes
 plugins/tasks/tasks-core/src/icons/fogbugz.png  | Bin 804 -> 546 bytes
 .../tasks/tasks-core/src/icons/fogbugz@2x.png   | Bin 0 -> 1219 bytes
 plugins/tasks/tasks-core/src/icons/github.png   | Bin 397 -> 469 bytes
 .../tasks/tasks-core/src/icons/github@2x.png    | Bin 0 -> 1020 bytes
 .../tasks-core/src/icons/github@2x_dark.png     | Bin 0 -> 1275 bytes
 .../tasks/tasks-core/src/icons/github_dark.png  | Bin 0 -> 600 bytes
 plugins/tasks/tasks-core/src/icons/gitlab.png   | Bin 628 -> 518 bytes
 .../tasks/tasks-core/src/icons/gitlab@2x.png    | Bin 0 -> 1161 bytes
 plugins/tasks/tasks-core/src/icons/jira.png     | Bin 665 -> 326 bytes
 plugins/tasks/tasks-core/src/icons/jira@2x.png  | Bin 0 -> 645 bytes
 .../tasks/tasks-core/src/icons/jira@2x_dark.png | Bin 0 -> 636 bytes
 .../tasks/tasks-core/src/icons/jira_dark.png    | Bin 0 -> 326 bytes
 .../tasks/tasks-core/src/icons/lighthouse.gif   | Bin 664 -> 0 bytes
 .../tasks/tasks-core/src/icons/lighthouse.png   | Bin 0 -> 847 bytes
 .../tasks-core/src/icons/lighthouse@2x.png      | Bin 0 -> 2322 bytes
 plugins/tasks/tasks-core/src/icons/mantis.png   | Bin 843 -> 732 bytes
 .../tasks/tasks-core/src/icons/mantis@2x.png    | Bin 0 -> 2045 bytes
 plugins/tasks/tasks-core/src/icons/other.png    | Bin 423 -> 141 bytes
 plugins/tasks/tasks-core/src/icons/other@2x.png | Bin 0 -> 183 bytes
 plugins/tasks/tasks-core/src/icons/pivotal.png  | Bin 567 -> 289 bytes
 .../tasks/tasks-core/src/icons/pivotal/bug.png  | Bin 735 -> 471 bytes
 .../tasks-core/src/icons/pivotal/bug@2x.png     | Bin 0 -> 1210 bytes
 .../src/icons/pivotal/bug@2x_dark.png           | Bin 0 -> 1290 bytes
 .../tasks-core/src/icons/pivotal/bug_dark.png   | Bin 0 -> 470 bytes
 .../tasks-core/src/icons/pivotal/chore.png      | Bin 416 -> 232 bytes
 .../tasks-core/src/icons/pivotal/chore@2x.png   | Bin 0 -> 303 bytes
 .../tasks-core/src/icons/pivotal/feature.png    | Bin 382 -> 472 bytes
 .../tasks-core/src/icons/pivotal/feature@2x.png | Bin 0 -> 965 bytes
 .../tasks-core/src/icons/pivotal/release.png    | Bin 514 -> 501 bytes
 .../tasks-core/src/icons/pivotal/release@2x.png | Bin 0 -> 1069 bytes
 .../src/icons/pivotal/release@2x_dark.png       | Bin 0 -> 1132 bytes
 .../src/icons/pivotal/release_dark.png          | Bin 0 -> 520 bytes
 .../tasks/tasks-core/src/icons/pivotal@2x.png   | Bin 0 -> 518 bytes
 plugins/tasks/tasks-core/src/icons/redmine.png  | Bin 381 -> 308 bytes
 .../tasks/tasks-core/src/icons/redmine@2x.png   | Bin 0 -> 639 bytes
 .../tasks/tasks-core/src/icons/savedContext.png | Bin 510 -> 205 bytes
 .../tasks-core/src/icons/savedContext@2x.png    | Bin 0 -> 278 bytes
 plugins/tasks/tasks-core/src/icons/sprintly.png | Bin 685 -> 775 bytes
 .../tasks/tasks-core/src/icons/sprintly@2x.png  | Bin 0 -> 2210 bytes
 .../tasks/tasks-core/src/icons/startTimer.png   | Bin 537 -> 643 bytes
 .../tasks-core/src/icons/startTimer@2x.png      | Bin 0 -> 1483 bytes
 .../tasks/tasks-core/src/icons/stopTimer.png    | Bin 393 -> 515 bytes
 .../tasks/tasks-core/src/icons/stopTimer@2x.png | Bin 0 -> 1141 bytes
 plugins/tasks/tasks-core/src/icons/trac.png     | Bin 727 -> 328 bytes
 plugins/tasks/tasks-core/src/icons/trac@2x.png  | Bin 0 -> 643 bytes
 plugins/tasks/tasks-core/src/icons/trello.png   | Bin 390 -> 205 bytes
 .../tasks/tasks-core/src/icons/trello@2x.png    | Bin 0 -> 283 bytes
 plugins/tasks/tasks-core/src/icons/unknown.png  | Bin 452 -> 168 bytes
 .../tasks/tasks-core/src/icons/unknown@2x.png   | Bin 0 -> 315 bytes
 plugins/tasks/tasks-core/src/icons/youtrack.png | Bin 334 -> 554 bytes
 .../tasks/tasks-core/src/icons/youtrack@2x.png  | Bin 0 -> 1120 bytes
 68 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 plugins/tasks/tasks-core/src/icons/asana@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/assembla@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/autoMode@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/bug@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/bug@2x_dark.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/bug_dark.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/bugzilla@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/exception@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/feature@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/fogbugz@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/github@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/github@2x_dark.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/github_dark.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/gitlab@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/jira@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/jira@2x_dark.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/jira_dark.png
 delete mode 100644 plugins/tasks/tasks-core/src/icons/lighthouse.gif
 create mode 100644 plugins/tasks/tasks-core/src/icons/lighthouse.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/lighthouse@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/mantis@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/other@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/pivotal/bug@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/pivotal/bug@2x_dark.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/pivotal/bug_dark.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/pivotal/chore@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/pivotal/feature@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/pivotal/release@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/pivotal/release@2x_dark.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/pivotal/release_dark.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/pivotal@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/redmine@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/savedContext@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/sprintly@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/startTimer@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/stopTimer@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/trac@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/trello@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/unknown@2x.png
 create mode 100644 plugins/tasks/tasks-core/src/icons/youtrack@2x.png

diff --git a/plugins/tasks/tasks-core/src/icons/TasksIcons.java b/plugins/tasks/tasks-core/src/icons/TasksIcons.java
index 68a2e24608ea..0beca234c217 100644
--- a/plugins/tasks/tasks-core/src/icons/TasksIcons.java
+++ b/plugins/tasks/tasks-core/src/icons/TasksIcons.java
@@ -40,15 +40,15 @@ public class TasksIcons {
   public static final Icon Github = load("/icons/github.png"); // 16x16
   public static final Icon Gitlab = load("/icons/gitlab.png"); // 16x16
   public static final Icon Jira = load("/icons/jira.png"); // 16x16
-  public static final Icon Lighthouse = load("/icons/lighthouse.gif"); // 16x16
+  public static final Icon Lighthouse = load("/icons/lighthouse.png"); // 16x16
   public static final Icon Mantis = load("/icons/mantis.png"); // 16x16
   public static final Icon Other = load("/icons/other.png"); // 16x16
   
   public static class Pivotal {
-    public static final Icon Bug = load("/icons/pivotal/bug.png"); // 14x14
-    public static final Icon Chore = load("/icons/pivotal/chore.png"); // 14x14
-    public static final Icon Feature = load("/icons/pivotal/feature.png"); // 14x14
-    public static final Icon Release = load("/icons/pivotal/release.png"); // 14x14
+    public static final Icon Bug = load("/icons/pivotal/bug.png"); // 16x16
+    public static final Icon Chore = load("/icons/pivotal/chore.png"); // 16x16
+    public static final Icon Feature = load("/icons/pivotal/feature.png"); // 16x16
+    public static final Icon Release = load("/icons/pivotal/release.png"); // 16x16
 
   }
   public static final Icon Pivotal = load("/icons/pivotal.png"); // 16x16
diff --git a/plugins/tasks/tasks-core/src/icons/asana.png b/plugins/tasks/tasks-core/src/icons/asana.png
index 25cea963476622af16df96939796061006fcc1fd..2d2958fc7f7384bd625d14b417f44aab9a5e07bf 100644
GIT binary patch
delta 309
zcmV-50m}a21;ql88Gi-<001BJ|6u?C0Srk*K~#9!t<yhCLQxpU@w+tS;45%Sk%r!Z
z;O68Kx#bYOgb2i`!METfB8CY{OIr;hc&!A%-M~LMhByU=WpVl*c&=P7p4)Km@Y(M3
z<2=7}uBDW+g0MmfNMAo_hbZ6$ODL={Mj1){-RaZGjyoWVk$()mp@j<S7~&V7$e03(
z_(4ui<8_3oCc`}p+yS?^GYmUw`h*hDMc>=OJ~3p`kTsNP1*gPIv@yZAbmCa~1sr1`
zAAZ1=wMw`^TzYZ>p7H7q=*gAkabQ@d=-0sp_y3f5<F~>L??~(!jNnR6Xbd=)mi1fc
z%av8}D4i%zfG+LrKugJ6&=2MdTg=hKnH1e|bzq10GX?Pn08TKDo^HBa00000NkvXX
Hu0mjfbRCnQ

delta 724
zcmV;_0xSK+0^tRa8Gix*005AYXf^-<00DDSM?wIu&K&6g000SaNLh0L01FcU01FcV
z0GgZ_00007bV*G`2i*l04jeA;*<bnq00MJKL_t(2&jrCvYg}a*2H^XCKhDgVjGdU8
z*cMD0TT*wyjZrrRDFqP)e}Q{{L05u%mql>tLR?6<c2P<Ng?}yzZSbqorW%uJ=%g`@
z>71E4=e+N8dtKbwA3=npQ<798&NBo6a%AaMSYs}Tj)I^dK+f7$_nza{Ui<K9ayUsQ
zK`4S-UyN^^?Oa{W=LZxV2tM9FoTc`wU)t|>a;J!AdalPdA{*J5J5I&3lli&Qu5I<-
zIpd8C%<Yc{`hWJ1_R^C3_<Y)2iG#B22AWVc`RR*%XXtM3yX)K2OP9;VUJ-KE_kTA1
z{=z34^A9hUN!~yKBu{tU#$wo9iAVMP&Tc)dddmw648@gIU8Z~cwS^W=q*rz@C-X(w
z7`6|m2QLzVSq8~K;)Au|XuX2;Zd_}4V$Z95JWIo>{(tQ#KN@S=nwJO(2q0n%wdux_
z_V(`h$-ilueGVP-rJ1GFmR6M>wF3aif~Q6^efHDj!7;l<8FJMRwo=ZQd(A7Qzpzwn
zE-!uadv)W{Oag(>ru4<V`u?$h<E8rjb-#6Pur>%?&*0_EklR@{kOT+-7AgyOpZ>RY
zs=T&!>VMs{zDi0!GOIHM=Um4*Q4nCHQX3>nC_MTRO;$3JCMf{kiS)nzGvAw-0|?N^
zP`Y&C<+wB9m)q4xuNSKW-;2(ZRhvhX^xz0T4D(;(94Ja+44vpceY5xZ-RZ3%e?D=i
zi&P+asD>X~F*<2VHG_zQHe^Z4LFTqz<@NXaH%)ib{b%*wxSc06sT;Vyn6GSfuC8`Q
zRsQ;6(~p$I$A6DN5*d~f<IJ210zA<R2&ra>MrS4hApQr#3}^SO{%CXn0000<MNUMn
GLSTXedRiC&

diff --git a/plugins/tasks/tasks-core/src/icons/asana@2x.png b/plugins/tasks/tasks-core/src/icons/asana@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..eafd61a24989d6b8c5706efb7c4f35837b23d2e7
GIT binary patch
literal 594
zcmV-Y0<HatP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006RNkl<Zc-rmP
zODIH990u?aS&+~u%8HRvN}|Yug~_W?Y$O{C8|7I-c5EmMNvV;gM|NVPBr7Q)6bm%S
zWIQ&m@)*zSyY;8j-@SM4Ls2Y#&FY-<>7MhQ!y(JE<0m=(1N@o*g&nhM(x4fpVFNDU
z7G(PM!zy^84q`RtF&!Wi=HQJMGwL2jAl^=Z8VH(PnDf&g@i}kRLgp800Se%eO|}bz
z&;Uh{L-N1_?evKxHZA}OW&^AX6P$uu>zk^Gf*yDh<``xH${+yeP{jje3j=Q;)x_eW
zR$-oF7T^SA;^zU{g@HpB7gr>+Pay`_7Xk!$fG#>}%4f*85ujctKrtMG4@!;nfEh8g
z2Oe|+gxrKiMS=?|pcCe)1JsVBtpMS4<dpp}1#56+vJ)%?$beC}wopRLtjJ6Sh=2i=
zGSaKw9hiYe;pj>l0ZN1(@bCa(G!b9q8Ma^?TA&iLAW>(JXa(@;^+2skm9~M?!imrd
zaG=)%ORWE$HjbpE(*p-uJ#Z!rs<qh(l9f&PA`EidSUiqxV#5KBgh68#7f*+6t3BXl
z1N-TUHL`FDUA;j&MWm#^V}q4zc@mnS9CGQ}E~I_Z2P^PuunEQYK&4s{Re!^COgX-n
z8Ue)jz@=6dD<!jN;X%4bFX(9KHSiud4Rsm0sECwy+@vS@$5nex6+A(Urm?X}&`pfJ
g2mb#v`m+Jv0j|BV`qe!;lK=n!07*qoM6N<$g1V0YdjJ3c

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/assembla.png b/plugins/tasks/tasks-core/src/icons/assembla.png
index 5198524088cb5bbcb62634d9b4829f40936134bf..3e570c9880aa85e8bbe80187beb5ce32d690f482 100644
GIT binary patch
delta 332
zcmV-S0ki)51m*&eBYy!cNkl<Zc-mw5|NlP&B^XS&rB7)E;-5hLpGXW++lp+!ADE<9
z_Qd}+QwshcKJW1V#ATcRD|QC{pRgq9e_lr=SPt0`WCOs0k!9`wcOG~9fA^^#P-D>l
z?uDuUn`dSJZ<?9?zkYfy(BS<4J~<QMhM*V#GX3B=$Nxt!+JF6@xGWK@IJ&a!zc*0a
zJp(A8HR*p?Y3KjA>K5z<bT3Hzzx$-?|E)(n!Oq1O2L5?{m<DXv@B4qxNtgc(K&J*4
z^b!@AC<dImYW;uHA@Bc5b&bTv1gZh|pX>ZzxH$~$PqGYHwJQK@KzL~fc?J}8Rs3JP
zHS~XcO*450fJLIQcX7)9#u+)}834kdL;^}UX-#z`8}J8NBDucde{@9~Jic+|2TC&2
eFO<wg2?hX)gL*I*BjgwW0000<MNUMnLSTZG+o1yh

delta 611
zcmV-p0-XKk0{aAzBYy%yNkl<Zc-oDVNlX)A6vyX+A)2%))@oa2SfaIZ^(29Vr7U&^
zrBg(Ud*Z>9XK_Daqzkr`3KbZ|8nuZg1`OcF%`NCjW4urzH{;!K`TM;$(>hHs@k?I&
z^}YB1z2!@#Egdm<loWOx97SDt91Vx3u=D6W_>Se_KlzAl_kZyR?4wwnHqN;o<rYXQ
zxjN(GM;f)lSs%%vp-<;z|A~iaI#WQ?=>p$(MW+Qo=bYL@SuRRi26)vp<esbuPH+`p
z|1|uk9>dj>hbw%a?>+%&JaSj$+~Hzgb)*tNR0<M+syP%LrQ=X__BHnD>jT^&0{k68
zj!YqPWgfrR)_)ifzB~uHSFaes9WqC#SfXYu(W&Gx|GtR)%kOx#w2J3%m*G@%<`Q$}
z5>v(!>0{f0VQlZth*uaxeeWbTwvBRS^};O94!!0(`6wobjaP7o%vW%>4>5pd;?}yy
zpk10_(WYRQyP>09oZ*-(a=dDWHKb+0)~*CUC6VpHG=E-vEMoEV4>-DR!`6|-*X3VW
z_)rwFl-YioHD!RSGsa8tiZQBM;#@Isz5uB?329#f(QC8p+t3>0>eN1I$^e>$h&AoQ
z&<391Uq>5wike_jw4Y=#14wLi5l2<?4J>|I!MiW3@Q6x#qLacV;8rsDw(=8imWrH1
zxuwEo09;vh>mXO^zxoXJwxke_u-O6$oVz*4vFesVY&P@D04qe=dmZ+G@&B-zZNCw7
xTErEA5`?~~McN5Hm0=0?S##C}SUdS&{~s0fG#0pUwpRcE002ovPDHLkV1jhTEcO5Z

diff --git a/plugins/tasks/tasks-core/src/icons/assembla@2x.png b/plugins/tasks/tasks-core/src/icons/assembla@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b2e1daa0276dbffe94071f99c5b9a492dc8ccfc
GIT binary patch
literal 802
zcmV+-1Ks?IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80008%Nkl<Zc-rNc
z?Mu^96vut#|6oKyK~lXaC@6XnM4@Tftjsi>CMBCs)6H!<w`M*}H+8d3P0du&h<qxg
zG%}?pghDWa5R51gp)975f`ZYvdye%cwwyYD2E91kA3t_?Kll8;=X>rA01&W|5%A9d
zgeqzRML0#cMPQv``qvtPo&c_{<HCQ2)f2$7JCDmPLv4E^>bv9^8aaZwg)PXj>oNIt
z2g;h1$gfr--cafbfZG#**9ozDEBc3zp`|w#vkSra<PL$pN{jCZLVBqY?<aSo@@5M9
zUWB9PNhH!N#$`c#1~AvEFz_;z7km3*A4+ee@^hlG1f$~zkmuCkR(~{%)!7VKP?w3i
zPC2f3CqSlhtPQ|*I~j{VHlcgyB)SG=ys*k@K+n??aI{^7rXm;CW+gJp@;MWh#x$H#
zSE8XSfk&Dr&$p}&fOgU`5C!+QZ2}?)TDuNSJ#lz8dKeMuPSkbC`FH2@mQo$2Tnc)Q
z&MD{7+N|JrG<QV+^v!4Hw({aMdGOUy7Md)}0ekBu7Nf6<zhEjxN@2mu0GuNABVz}7
z=TkG=`A<mUl!4WjUTTTSH-K|GD;5?v^R6?+w<T4R$|=?1sV={HfmeW{hIGse02189
z)Gkp{CPZb~kzJnWS2OYoaQ}G(n++KZl@f`L)a`FK^a?QXWhd{R%!bPFxKR9h*s)iD
z)(0_Yyc>_UzO(%O?>suqH7yyy?0hiZP3&QJBhv{}R!f_Kv5$KhVED};&Va2&AuRw2
zuC_f1=4&dhfEcY!S^!#{MEH3+gu7c|eTK9E<l}15WD*P(woqy~XEYVk0Z=>?y`Qr1
zdVD|keMvJw5u>v~Q>o{%L}-FquA~4IT8EC$0-cYe*o-35T+#wiB#ADVY%an*QI4jX
zEa?G$H>WG&a1xnW<yTKw(V>)r&H{=eGas@1;SH-gmQxs9Y95uvm)8Q|-sp>o?Qd7J
g=?%G>{kON{pB9+uWQo#4R{#J207*qoM6N<$g2@$f%m4rY

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/autoMode.png b/plugins/tasks/tasks-core/src/icons/autoMode.png
index 9355db4b2de6ade4c4aaa23145cd3bbc2da88c35..8b4cf8c4b6cf64b88320fb281239d4eac165a0a4 100644
GIT binary patch
delta 371
zcmV-(0gV2Q1C9fbB!5*&L_t(|+NG0APQm~XhK(!TcmQ4Us0At_mS>@8X+Q$<kf4xg
zH1QH}1vd~C!H6Kxl!r()Dv1d<(G%ziSolj=_y`h8SbVda$(NabW&q4g!=R*6Dg2_c
zmUqLD<H{?i?1J0@f3S-YFtr^R3*J}i%w?L`z$GQXKOe!_+J6IG^7p9hW|B-hW@Q^V
z+HvqN$KX2sA?*a{N)Xfq*IiCCi?R%?w=uXnhXdHB1K6cFXdwh$-u+IbneDL#rbZNw
ze&aWf`>@^jO==NPSDsHI<2YBGSms7wK@7q25Ff%U?ZQ|OLwD_gD#O%98t8=pXestD
z>vvJ;1%FnZWo+k18fYtC7+T>WR-3^OO7I28?m%<HL*ESi(C~v2eO<E1Ey=n9QQUy8
zzBNEAdV6HqomA#0$bqWhghu2+R=GEI!D*g2iONeGh!R^><gD_3Vd`(3hA%6eZi^fg
RUfuuz002ovPDHLkV1hJ7taJbX

delta 370
zcmV-&0ge8S1C0ZaB!5&%L_t(|+O?C*N&*2ChNV?)e1KYdOLH=_@jByJ<DiM=C9xEW
zf?h&jp^Z|RMy9F5c*&fi5(3|(o}iw<MStR=3nq?Ki*I>;KF)uR41nx6$o?!Kl}h0Y
zmF2t}#vEH-JYwWh1HR!9BA{xUFcrK{#Iegfv4KlWfP2`7vwyV>vgGd(*|nrLO;1TS
zpxbe9j|X5o{g8G7WF-jVl<m%^saZ(|wyPLioxK6f{Vp7093&rtKJR|fq^XUu2IfW-
zbbs)JyB*kX`X;pqh;z@ICPSYn4z1IpTM$C9-o}Tph+8n#!_Z%Npvq9Skp>1n08)(o
z$jWsT2Hu}lXKR_6kp>GDFO0455KGPAE5ZAMV|Spt<X~t9K56(t2)?ei$j(V>K~r3X
zzP>(SLGbppWp`4UpWqHu1t)X@2W^#oRu`O>i7!!kW{0N4R24a!{9nKE9h<stiyYgT
QegFUf07*qoM6N<$g3z|DlK=n!

diff --git a/plugins/tasks/tasks-core/src/icons/autoMode@2x.png b/plugins/tasks/tasks-core/src/icons/autoMode@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..572d3356fb60b3c51854d9be6b00b2aa127e1978
GIT binary patch
literal 866
zcmV-o1D*VdP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#1W80eRCwC#S3PSKQ53!J&BxByegq?e
zHp;eXjeUNAwi*%(?N+c6!4SkQiLnm;0qvu~DhNT-NI-}|un;?~v<cbl?97|@Ja4j5
zqq{RZv&uF;xa`Ng;huZWxp&?$r4)^GaT@a)I{@?7AB&5NS$ZryKl6II_x%at7Gl3>
z!oAzC$}?a&4%wbdrfts=V{d_WTEas`B2NOA5i3EXPL0!(6ihUz;(JYQ7~24{Fp8AL
z7;qh`1Oa*VdJ4j=29{}CO8~Kn+Ro|v@*)pF*1h+RTh_2la(tisMuWUsjcmu6VVv(`
z*A=}dD@J1AgqEDc6BV#gBM;IzzITe7#yZqm!(~Tr=@%n;;CDkQ#=wR}j+RA(s8(T6
ztA)RJQ0>$|VnCh@@Xk!If$s1cHFCiSyfVcMzJru4BxOYaWO_hKNy&iF8@O#zr5XT4
zU3ZDYO>+(ZuLJnxux&WB2l_<{!ZgSZJaV-pHAv!AE~f@1no*<9fjoz+9thSms0#pI
zy-K$0oaF}J#HFR?>Lsf*0|_)AHY6Z3+axRS$(g9>PY#I|6ldEPR;Qcg<^Z&oG8sA)
zfG~q;86Zc1F7e5%*wYMS{QSd<^M5>y^41_H=PkxH2s;I%J<>Hei#j3e2Y_XpP%i7%
zD?Rs--16NW#c1|JYwKfS2BbQow&X&usz+$$`|svo#C^{L1D+Q@&I8B8r^NaK>8{II
zyxhIIG5A0-gb7k(6<ixCkvBvXe~sIn>=RL*2atTZ0DurT+?66(i^E7oNFE=Cxd3uJ
zFth~kl~mV2`JPT19dt;95y>RU1(4|hU41SCiXOvgcam<@i4VfGYS6FI_if=4b6_BV
zZ@7LFls^-lF6rc=gQ|tdoE?A516!Dqb4esV$8A)NNV+k>e3Un~3U+}!ik}PR(F16^
zBEnee#Nx0^Ni2FDQ}DeY-vcLf`~;)T!f0<a)oF5VG$Dx!jBB&#Fgpr*3VK^fSL|z(
s#cfm_fefh%B~LZ~|8hER0N(`|05hSTz|<MhnE(I)07*qoM6N<$g7`p#od5s;

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/bug.png b/plugins/tasks/tasks-core/src/icons/bug.png
index 9303d5a019dde6680c500ed902683133c108b6cc..412b67006dc2277271510330c077e7e6293fc752 100644
GIT binary patch
delta 456
zcmV;(0XP1*1lI$Q8Gi-<001BJ|6u?C0iH=jK~#9!WBC97KLaHgOhiUTg76t2PJ^;x
zd>A_o#>Zy>x*;=>#WOQA8PG9`0U&`>k>2iSWBk{hO9*;;J|XBg5WhYbA9!VVOyKF$
zkv^$-4LBR?H}P_M`2U*)3IFeurv6`2kn#U+dD{Qm#mWD#Wq(J{IG+$G4$_pIoV+O`
zBjYcKh8u7;+9&c_R@DD{<>~())#d(w(vbfjs2EJ&ugF*mWV-|LYY+|6jNyVy$stGY
z0c{0oT3(X#|4Drw7(cAe`hO!Q)(j|q7$gU!F}-jgF7W%w?3n+j^5RkOvGj=l7vclB
zfQo-W4fu@J1%GE!!@gcAO#FYf2o;~pi1>dd(hFq3PrL?PPY*wEzc>l(g(Z1u{~wej
zgYivZxSR=dw<YL>%khB$cXMO^-v`D341+Y>%8dMfF2ZwDR%V6=-arIJ<BjCd*1Op;
z|L*0){s-a3S;_zJWJdkJ9P9u8q@UC5!|qn{IHM7kkU?6a!#18v3EO!mJ@Uz&jL6?W
y`t|k1;4ACGecv7Pvc;c}2qk40n>Lw=5)1&eX)Nz0)_c1E0000<MNUMnLSTYe;^OcC

literal 568
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47!?A1LR|Ho6aN4I|L@;FAOk<r
zunseHP6U!R{wbk>?m)$M?s@i}#c*Aw&Z(h}KCzze{w5wF9(GpVp@F78k^U~};U0Ew
z`HsG2;hxsjkyhD37R~W4?b+U$ei|nB@%J6np4e&p?_cg8-4>kMAD%rmCVzIKw@y~&
z{K62eqEPJ?H`7*o!8S9wu3WDkC!xtM^0T}I=V$9Lv=>^m{nBD{p~X((Yr{m>?Z3W$
z-_^}W?`(+_-Qy{Cz)SR!hr(4ag&Y2MHv;u;d8#;g7CyAoc;sT};9L5{PV42iC0{nJ
z{O_Fn-z(#PQTPAq>Hj+x{O?=l6W;uP;)?(4cK+Xf_^z|cEoCuzV328*1o;8Oj6qpL
z+te&RIj_2|W9p1qv*)Z{yLRKI&0Dtb+`W6x(UXs!JbC`<^XH$x{xH=!169xUba4!k
zxSX8e!p!5q!t#hmpdr>_PW#M8VU<Hi`2-VECWl<v5Hj`Av*ac&k81Z<ZZCG6HgaNR
zVP3T5(H5sQ%&rTWvTiwA-HOZm^{wrcPy(YeySue^u`zS_^NbFzuNx%p7SyZTiYKdf
za4F6YSR1i6f!khihA!8(eIMt^nHd>GOWb@C;^Slb^e5{ACZRn#JTiwArf)KO@NJGn
b3<JZXD&bS-YMiD59m?S8>gTe~DWM4f4>I4L

diff --git a/plugins/tasks/tasks-core/src/icons/bug@2x.png b/plugins/tasks/tasks-core/src/icons/bug@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fc69150f98f346cc4804b7f42abab03fc625254
GIT binary patch
literal 1210
zcmV;r1V#IaP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000DmNkl<Zc-qC6
zTTC2P7{{?Ou`Pxgjm9*w55D!m#I#98(o_=!mMxSmGJ9cRx3DbC?5$iYwYFShtM)}>
zVjAj|U}|DCYE5drV!@@$E;nf@%U%H4wWOLD(+3R?&FB9tXK~ofE=w2EhhNT|Z)VQ_
ze=alUd|5=4buU@Ds1Ss;cmVW+{4}0j#d-|%fD!OBcpW^M(AWpyJMgfA&?De;{yrn`
zZVc?@0vEs~FboVbk>_~hZzvde3w+4m9RjwyF_4If3-0ChE#Olg+bMhQX>ficrXZ2+
zT&zbHE99~Lve+5$+GZHY(hGw3grEt2D->Vw2t@;fg6eO#P;|$$%pw?mUnp5PE@(z2
zp*%bOo+L>rS<?U-&IV0awW^z5gPKOFN@>hgMq@_~(|Aq!GPq{35o0NN^=cZ>7T>}<
zRT&#VBTo%$Rnxx8l9<T#20i&*CJMG#D15A*X4}OW?3%^cy=x6R8aE#%pWz@43q_Y@
zV%xx3;0HH3V@VBogu)`PzWCp9vxcT@Mhdpp(cB3eEu3;uq^pto+MMLFN%ZkC7e%|9
zV=;Db?qwS@^T~C|@XToSp{+6luX53Ez$6F(jiLe1iv_!VdiCu|O9cg*YG@w9k&dJE
zdw0_cc8H6T6f+@@N4pxk5zhr7&a>PA>v>OFQ{dI9+>><`6l%55!bt~3JJHLoqpRp^
zb&wO{tc=GZovvWJUD^TBMP`n}t{>#R-@T>*Penn&1m-)~Ttf@5I3Qq;^^%p*4p&O%
z+r>7B*<|8z%xNz|pF!O_Z8y^VagieEy<Pf$s98N3zhRmJF4I0ddr85-#k37v)~XlW
z^*Zu8P2_c%>72ce9B71<te%XkQYBrh6CQ<FM8QA=VlA@OpWHxyW$BU!jd>lWbunbs
z(L{CGeGpqxFtC*N2n3pIZ%5do>uy{Z;g{-Z)S%vyv4K#V)gSF}F0XvBY7z3765%!r
zjc8SmK`g3ZAe#0R_(lD@b1k(rk57;xUxe|P5;L|+@(G3eGhT#KmWtePqnYOL88UjE
zR&t^dR>osW_$56v(3SCL$bLj2d)3!-jYlXIy$&n6m@$;B9uN&Qs#7h#Z4@3?_z~ss
zp?@eX1AeP^XV_VNYZjYJGFGNW5@YoszMKhT3Aqm*=#xY-5BFv{d0cD;oJ@N+42p(5
zvySRN0V(m3&4Q^BV<oGHv0>f7*6h{f(_mrV_g7xX%?H^su{ZfB`~s%=W>l7PI}VEa
zU17U%08lyv@B{l5Tes)X^E6nLM^_4ReKG^v!D%p+)^;2xVAb6p77gYZu`(FOFsCAf
zbud#WU@A)g87VI~Go(JSE#nhW96=D=r;OT}VXM9uLj5-y41f6>40mwN_ydf6QLB%h
zH|Z|IM9xN^3AX}o!iiVlhtgfL7(0-Pn{g<uO*oeC00TUhlW;75ZzBxs0bhZ0;4_|J
zXk?8wq)1FogLioL^b@GhBsF6>U?+GYLF7yDLz2{tP1jjjYPN4f@&XwwEBbNMlGA&|
Ye|zs)5^k8ChyVZp07*qoM6N<$f;3PqtN;K2

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/bug@2x_dark.png b/plugins/tasks/tasks-core/src/icons/bug@2x_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d02836719e9a80e4fc2c18852f6cf061f5eb6fd
GIT binary patch
literal 1290
zcmV+l1@-!gP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000EhNkl<Zc-qC6
zdrVtZ9LFz9H0qSZM@)RgKm1Ss5nTq`B2%#x=zu|?w53p3DYUmQUX$Ul0&|i%A8}FB
zK&BHRj+v-4iw+-)3=5?#&@mvCJ}9G|Bk?bzi!L$#{GGc~cGui?g<{s^lXK4Ro}S<L
zp7T5BcP;|}%<W{YVzb$9#ofry$jeFey@~Y*=tU-x5#%WHWXxb6BR?V!2snBe`HKFZ
zuxld%o<qJzK1Y5+oQRC)<OMqTTLJ>!Lr&2Dl9@7WL;y1(%Uc86YU*$sZKok$P}`%t
zei_JdT2E;SVg=koo%Qi-VrqMyXFGx%+H?Vg-j6<X4s~_-N7bc6*tU-=_WbUU7yOHL
z!YblAYu1KOc3USuJ97BG^#*1l0b7yQ33<U4mr??gRYfqZ-V4*UrQq2oy$;r=)g|0B
zmqG##Wg!uyPEA0$m^jaHR^%_ZD+|$y6y|ga@LJU1Z>@u1TLUb$>p6l48aNwyHj90T
zAh&W4IAwW1#BASp5g+m^Wjc|7e3!i7FHcPg%(Io8gU~?(tXRzu?rMa={bp!1urT<F
z86t<8IU9KvI>>^*MKds`S7uIC7vI4X@HTaN2Dw0m$OHvUl;u9{R!IK5SXU0d=6$f-
zVSoraxQvdXn9w=PvYZIMJ<{FOg=1tR%am*?z-znyOS}XQsVL1Q&mX_2l|caCdgV0}
zL^>^;06v5JO<*B2fMwJc?zH$%d~oc39QX<XlvO01zWr0T7EqQe_SBSuzgYv9I!rLo
zYUJLMl;PJc2?@39TX0Yl&v}&Eq=V3{l=LqcRj~Z39>P`=nAjUrP1^Cegv;c!s55cU
z?*s&#Nm{^gg(NiAAP1LO4K7O!*o;~*qX1Hpc03#ysIywxLpW$eKmf6|@uEMzfOC~a
zSIJ;5Q}w#AYb(H0T}+PXYXSnUB|QTe^?!#uacgxqu8Uw>JxnPiTT&L_Z`B4?tR&#f
z95)A{IWB=#4Y*}_Bo$v45D-QzNiBi5LEgJe_I`_oV=V}gs7;7Py%OAIVv?r66%g=E
z(laoxDa%^IBQ?}i%h7MD2ManUWz;5wS0_gSxrcF3RzQGyUAe$-RGnUGtbs)Io3z}l
zkdm|)^$M7($p7ujCN_2%Nc~<q^$#W`z*{GKBxtOPEMauV<HpkHxwc=Ygc)Taj7fG6
z^&NYE2R-Wv+j&QE2hVw0!ffc%$)5=tRjUXH@u@+BOQYvX(hlI(oyRQbEXjdU@lN}Q
zD60VB-x=Sbv*17iNC;8H6);y-%=jDRj|JJva|k4Z56^-bOv4jJFTyY4U2tBM<&H_m
zZz3MvZt%nv;M|+T%%X@zt!zs`r>OO@s-*x%dLsPfzJM8YrmFZ4w^Y<QF4=w8hA$+e
zxjPwr6Xt?K!YtHEiOqiMXwSk-qoxl94SNl$RpcM6UqvE_d;EYoGThnz^<rK5)|Bsr
zBRQGOdC?ALtROo&eJ+yBy_#~yr<D<#ie5^ez@=h*^%ca{L$={;RZ;4f(in8qSq5#B
zoIgr!>AZf=BA;x=m(g~5qS<IFwIjv6!SvL5kANd$>q7=;#OpR9;5c<~7O^6a$2d7n
zznszq1l)<d!TU7Zwi!#nhh)5A<fZ@R<Mej%A3Y?Dr^-r^A^-pY07*qoM6N<$f_%|h
AxBvhE

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/bug_dark.png b/plugins/tasks/tasks-core/src/icons/bug_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..5926f1dd2b1b83277d355abfc3dfbec6e2368bf7
GIT binary patch
literal 470
zcmV;{0V)28P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004<Nkl<Zc-mw5
z|NlP&B^XRhpFSOg&j4{6lnvv<*l936J_FDVnTf+NI7TrbGc%LnRHV22*%<$I=MsXR
zo=*t+4aBd{#RpzFnih5XbfixzUIWg?`c1r?9{&GkLBjt#rK$gy6lDCrTb}m+c5(9m
zYuV8=&L;$lgVZ%PHg1|YapGSP4L9Iyv`^%<tf>F@%G3Wps>}WVq#^%5&_!VSenrMo
zphkBfehs2QnlW5(DLLfmJ)o^1P0LGi{y(YD1LKF)S^sb3#F_yW9|q$8P#V(<2jT+1
zpUjT=e=08?1s_X~_<tcjfD5Sj2h@PiSY2=?HSFt^!o>eqi%{{ojEMhdBE3Kc{KRX(
z_4M!q_luLjURaWs_WwaiG8o?khRc~ScUyv9xEvoCa5p#h|9xN#z%a<LTbYsn&qa7{
znlWvf2i`ygac(4sw%*N-`FAfT_CE+O&Px7&Co}5*<yim!C;gmeA9lBr#~F>VgtWG$
ze&dy_n4NdhBcI&Oi2MztUtdoQzOp|f?%gpjTl@)$*rZIG%tQ$W0M`L**dpk#^8f$<
M07*qoM6N<$f-kG!X#fBK

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/bugzilla.png b/plugins/tasks/tasks-core/src/icons/bugzilla.png
index b06da57f512e72d9489c04e5386c21cbce3aa4b8..7dc4666337d28f036a240e2f0b5917a97692e9da 100644
GIT binary patch
delta 752
zcmV<M0uTNE1&0QZBYyxHbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!
zsYygZRCwB?lf7>gR}{s6@9li=47>KOB_}2V7R3!8Hb}TYR4G#C4@eXultf9FDm4-X
zElHIMkf1>{h=vM@0tpF>40b>X@)wJd&4S|{&ob-TnVp%uS$~X;M9GuxT<N|0&OPVO
zc_PnqK4pml;OuW#mu$N_oTl;ic8;N01Yr+<Gr+N{n1+L{$7os)AxyfFzj5x5?;BcC
z?m9yUJf}v|?;&MQo;j?nZQ*%qocY!yX!n?&dyN#MXkss>nW-!)#a%h*m&F~jp2`tv
zQerb$X1sBSpMQSY!<Lb<>QD3Ycbgn+JX2>rGSA=Lc@LloD5)@{PTTi6{N*A){`xti
z<5OI`_74jiV^sHlP1SovCzvJb7?}EiJcF;?1`twH$N`N5F7#{kR_6Kh!g(x5<K@x}
zCl2kyse9bJ-6U+6*kK^m&@_>&9HZmX+As%*Y4;6g_<w};rH4rWU!}dy)K}l|!|z9t
z=JQ<!g@ht9QaszE_3AZg*u}D4dT(YZ#|ciQN}LMv<{U%&>KvJfK9*2~XK8GO8bJ_a
z>3ww9!FEf9K2@v=k{2`|%(C#z-UTRaGf)k%41+K(D>_}?iiF!Y7bsC>xMq=NDQ^Q<
ze=&lL-G2`m<O2Xhsv=J^x46OyU(gQsF#q=<Mx8RP`G~@^wr=xTy+XUU`T;<mQFkgV
z=BwO#bcv~cz|$KQI$_F)b&}fHB&9?Q01D?y87hX^F2InoYBOkZdHOHTlm(|Jj<Md3
zC=W->cJK3eqskY<dr6W|+4!C0Vs1OXvF;6dS848EXMbyf)2B|c)laa>5?S_`^k6J|
ziO^hJHJ>6p6=mJ<b{H(LFF%iysCK+DnYY?8Yn@zm5^Cnk^QlEA4vB*`9HM~)Q#V9A
i^#9v=ji0jq7hnJp>=2ppUxI-E0000<MNUMnLSTYQwq_Op

delta 743
zcmV<D0vP>=2L1(*BYy(LNkl<Zc-n1}*-sN|7{=#+GV#I-6Jz3q@lL%^<Bd0JG?qmv
z*y(hIvZ%D|ZCaqEoo+J~EzGo0qo9&#)VM`JDschH(UY9xhG3#UzZNWRll=0`%=<o1
zp2>WY!xCHe)@SkjM){qyK8~|?1Xo@9kNFQIUqcSRT>RE)D}Pc&F5<Uc!E-9kV8<}Y
zo*3ukBz`49yLG%W|FJ8zHRuH70s-3w?baN=hBHiL`&fEnV5n_e&2)0l?4i9WK$m=3
z?3tBa>5NsU$6laYE@O(}7;0xb|J)sBrKFS1q;V(;cP<SwHQK=)qaTkYQ}sxlBA{O>
zRPi?^C|wD#Jb#;JW&S)jZcNeYYvtwq3~wH&j72?oYR}PcU)z@gjXEK56I9HK`WvGx
z-U{-0F2ko86~3-gzFsXX@@_`s%QKx9_i~JMCF!%}k-D2S!cLR0!&t+0QB?J_TFO>h
zyf2x&cyx)yhZp!bn_+oQ=iC3&e0)1gxHX8>ds<^y1b+-U${0i(dB!4Le3=&kPelt6
z@?knz(eiVdmFGpiE=@3*JBu_R0!CaWv2})&JSl%4tIyWVKN~kli%(3G>1{&_*)$Sv
zllVF@=QydeVg7p@W9e>`*@-^x7kZhSj8K{k^YmJT$HhS|4)hRgN+X43jg-eE={AHG
zNV*DW9e*(vrb5i$3=(t%2+6}FnpM;mmAF?WA`Vs5E}FW<Ul<etS+9ZSHHpeu;sJ4t
ztv03$0Y*cvN?>`O@%$YrYR{4r<{@VSuiMSuty{<+K8Sz+ZUzqQq5IGgQm#C@2+_Uc
z>$-syS2SXxlI2((HM@53##zT(!N1P>3JZ1%kzf;U&NmkrZ8rWuQXLw;qit;4yoo2)
zW4u;sS+v(wwaoQ~CXx=Fe2YQ8`Bx-WNpoVKh2uN7^W0{snm4H7w)G?_dji8}Fy8Vj
Z-vKIO=y|bZDOvyk002ovPDHLkV1l=}V<G?m

diff --git a/plugins/tasks/tasks-core/src/icons/bugzilla@2x.png b/plugins/tasks/tasks-core/src/icons/bugzilla@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d010d4fe95fafaf11fbcaecbfe54099c5c9b9d72
GIT binary patch
literal 1909
zcmV-*2a5QKP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU(7fD1xRCwCtms@NcXBEePGqX3Zch|d)
zv%clxteeDfh#LnrNeRu3wj>dV1}Y(h1QJp!0YXIriANqPgoK0$j|d)8Xc`qMgtn@h
zhCq}wy%0BPZsf8};>OqYW$oSd>~(f#II~V%JKjxzmp<@GN1EMlzH`p^KmT(X#kOre
z%cb%eFW0??pFDry{f1C$mthp=@7I9GMiJjF#lW=kXsQ<tAC_%B)S%ntC9Nmozy93|
zTNgMG4z+G=ZR#RloO!t0wt}MA7<O8oL*!?CXfBm-gGSlZ(KH{nWy!N#Mo|_Vt@8#^
z6?MxZ1k7?VQ!34b%0~9Vww*(oOZ2+AJ(v&$aXMm9EErt7*~qe%9tK8l$b~|*M<eL@
z8OPw<`I7i!nuW|F2b6hI)v&<paeHMyz;vp_C*zlit-8hjJrTM#c7oT%$=CaN>D43b
z{-TRp{bfcHyJ(I2DU=G_Z)dRs@~<YMR`I}zZO|WLELk9tJc()FVRNsa=f2kiOZM{0
z!M~Cky~+=Mwoh(%g5K^9Y%R}Ee}0B&<JUxYUX0Evc5GC4-~kBuJ#~yt=15Gv#k2b~
zI%AKpY<a5~@8R7KM)=pAG?y+-(f0C1o_TsRZ=JZ#-fus~{=I3ApSZ@xbsd62zA6Ih
zd<4|0Vhj9!hQ{CFJ73k<@#HSrnq!pGj>0vZI(?dBuN^`yr-^iaiRo#T-gQw99{3x<
zV3tTEDH#$JqxPK6`Mgx;KU5Qs=H<@F0PABqkM(?x+=Px{m=%F6TeocH{6`n)?pni+
zZM}Sw3FFnubgYPSdnCo}p*{wOlZ5LVMW0>KSu+HhvM6gLZ$0D+Q#3DiLokezE#Xv8
zMVM`jU1j%<FYs|ZPOP)D@_wj!H3RW0?0mY1o%wFo#4hmq8%H^Rsh1618$_R3L1S?U
z?#lfL*p`7$t3xkp0tXc`Rm!*O!AK`6XCGO;8daTDrFk19-cpeCtb{4c_B}g!@mJ5X
zddnE+ufB^?_TzGC)w94UE{@D!lC!ilwvw2*Ng<WQt%WI-<rY%WRB|K-`be2AQkz`l
z^%PS>=UBHah*7X4TPz9*le*=P^Zgfg@t5dtIs5i|v^KX_M?kBBfb)M-I7B8@NB@uz
zs^0tQQK@)LUnG0$4JNM~!5Ti!qwNKvOPeSa%azlrreWo0GvMpr`X=3*Cb@p=dUXUG
z6sy$%CvN3pfWeU|)_q>Mke;oHrq~Du!t^XrXT7%+jG{#@Tc{YuHnED+m^1yDxe?s;
zWxl+<nNw#j)UE^7+M{I^@v1?_#>Yje!F;Dp%O;;U7rd|BW3r;j>siW~{)%RI*@NGw
z;qfXpLZIB^!a}ixhz<2&(rNjT(<=rXacQb_!iRKp$rig@5+VyRn|+-6=O9KlS{(tk
z1_DlJYpAa$lhep%bbOvAa_b_Qd`U>D5@}x|n&hNFKkM;bBFi2=37Jo!m>TEk?@x2>
z>?$_IR@Tab>Ku?-NTAL~GNqE7)>#p2BQY?}Xi}%K$;;o*eMn;@#PYVKsFo>dHk;}B
zqRCXcz;L2S{92yOXb0QY?_fl~Q5%73y}<d;?ba|24Lwu9)(focXrZkm$Kj(Fc>k2t
z3U`^7X6gS{NkVVol!|g$#VmRx_oYoYtzzTGaHV>djM8EU)GFQ3xw%_&3zOwV(<O1N
z7bkS=l7Ty-aOh7LId`&&uWbDWUY{yqDPUDXW>?&Hi9(m#DZmB=BPX*#l7KHD7geeu
zV9$wTT9Y(V%Wm|vPTN|^Yq!C<V>j56j-oDafw9|+42RkC_&%A8?g&5ZPuYK$NQS7I
zciGuyG-sn)2<~=2m&=VYW0GN<;ChXh`d%h3#bbpK?+=GVymNDsOeV$Ei({zWP4vbd
zC7YeV`cJ0dTHSCy2h^g9u1yiy>f*p_2RZ)AtNbVs;Lm$^^L%?7)Bm_a@X8dw+|YtH
zdYDu3vxEat2m6{`_5SKwJqsMRdjd>k#;M<6^P4{&V&cp>uKoBqB0)bB(-}4`i?S`&
z?#yTvqOFb8^Wvqqxg2hzdx^||#oT{|z`}McyFS&&#nBHqa_mj)@f>|W{4S9?FGG{5
z%6_U?s>tl9X4B$tWPjTvN5?+Ijy@xLvUB5Ctq+l!6H!nYn#c@s{OmFMZzuT0Q%}&;
z5MU@hQ!&2yHVR|XXu6t~vQk1en4XjY#$C0VE)Z&PAS4caJbInsnIun0kKZnZC9mfy
zh90!MZa)o5mW)0j&))xy0|8H6s3{<mZ)%w2RDyM@W$=vDIpqwG=ON`@8cd^_XUHxR
z4K$K|Kzj(+1*jKWiyXK!J>2)+&5zb*W!PBNu?cUWjq?*W)5X~ju?MXN`Iw4JyG~kD
vTpo#w&w9;w{cfLQD?aD^|NYnTzXcco;sV)IdW?d+00000NkvXXu0mjfG5WO;

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/exception.png b/plugins/tasks/tasks-core/src/icons/exception.png
index 3edaf7ab9785581055475a5fbaa74a30f98e92d1..02ce6b16d34899701987234cc1e7648d5bb79905 100644
GIT binary patch
delta 401
zcmV;C0dD@|1gZm&BYy#LNkl<Zc-mw5|NlP&2+x@_=RW~l55x>G4AaLzf&n*?4Z&vs
z0~QPtmjdGJFhg(}u(#8h0Ue{e23d|M1CR_#1Yx2L*i`Q&d7;Jd-_;J?|H$}Ko8JGO
z4X)D(yP(Bo^^GYe|L@E(`+sMy8JNB?%lzN|Zm%MOF4$1#!+(CJ&-Ux>1=j!XFS7yT
zTZ<fiZ=O*!g(xp<ZE&x+Fvafw%>@oXjgJ3sEp+^UWsc*Yy}dz~Hr9EW5DtSD=iBF|
zx%|I6&lQZX0P)3{F8`1BI{n|*X#aOpmDAzX<!*jB4cOe|ExW(ZH{{49pY{{eyf>eo
z;dSfmOwT{3r+>NsKQ_Vb|GsvY{~M~^W|I_+yC%i#KRMO=|A{GH|MzxzFI`pX#YmC?
zTiXNf9qRY~zrWXe^ZGhZW~^a=1GmhXIX!h#z5B22T|w8^*SfLc3`AT8%<C-cTHD}z
vZ{Cba`M9DHjBz=CevYl%vSNEtba4QAK1`?Ck`1;1015yANkvXXu0mjf(n!-@

delta 587
zcmV-R0<`_A1LFjcBYy%aNkl<Zc-ozk-%FEG7{^Zt(Vq}OH{At6x6+kRi3w$OwUX5+
z1tE)S)Fxd81*0ZtR4NpL;cQKUwqV)1Dx9zpsH=1}@m;IU@$QH3-o1N&Zr{#%V`ll*
zMF&0?=N!JD=Xnl?03Zza;Phupynz))XZN+86vEhl&_S9xvVU2i>UA_x7+M`NrSHZ&
z*e?e_gL_!`pMq>zGszTHqzei-UV-yg9O3wPbYGlel6`*_u&SAoYLYIfSf$}q{-+=(
zXqcQyG$pOp0^07nq??qgI*Ou>0_D-Oj~h6y1aaZ!M8Z<Q=ItFAF*)PB54-aLTpl0z
zqJYio`K!62rGKEN*3GKT$`ajcOA%CDyRdSOAa;siX{-;SH?dOWB(WCsxLF6I7#a^l
z`St<godZbP2@<#4u@((L6?g<AvEs`v3xTB6!3#RdRRaxKfH-mjsh%B3Ke>v+{A=j4
zh=!pfG!rfPI>@#yf~sQRyz3zrK5-~}T9G_Uu+U8qwSN(Wj}e59x4?gdV61&R?zLG7
zWCOW%4VuyT?a|a+5^sBV!{15ZbL>Sn$E(9_79)sMFuy99yiZlJ$Vp(T%y1WcwDJq*
zA!u?HZqLNm@xvB^O3k1_(IoywL@FzzGUtQ;XbWaXuhXz(er;R7H${b81%hO3d?b;|
z*qZDh$V4V)VQ4A@dd63DQ!w?XU|?{1+17uTYr<vn>QmbG;xbnodK}E3zU1Y8-CGF$
Zmmfb*@12dFT~Yu5002ovPDHLkV1h{#8SwxB

diff --git a/plugins/tasks/tasks-core/src/icons/exception@2x.png b/plugins/tasks/tasks-core/src/icons/exception@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d1607adb7f18b48ff796753ff25da075dd5c44e
GIT binary patch
literal 862
zcmV-k1EKthP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009eNkl<Zc-qz0
zTS!xJ9Ki8Kbb0BuAm}xSN-9M~o9^n)ZcdBddNITi1>vP->1pb`q#J5($6cJ0X*pBz
zMpH4Tb8Xt(m^z(VXh`)ERA7;4qQ5qwSmP{qhaNs}fA;^Lo&Wj&{{#RacvGv@5GK@(
zfX8<(4?+|I{6@qoV9#GftO9QPiwHG<5FqdIH}N838Q_uU8xgAjfBy3TLoGEZzQ5yd
zTr>l6yhSa*j3#}bD?JN=vZHZ(&r$mQhy>_`8M#i;IasPW53T^rRbSd25h2$j_79lK
ziEAs;i?G&`0PkA=?X@yxYpQ`uir6a{ddN&%kR<G_wk5)QT{3*=^6yOt^@jz^Iup?~
zFkVJBE=iMMtvv<Sb*X+WYMEc2w$$H==pyV#krURc<ex6ZWmxSX!rBvj4h?TztH$^d
z{|d&0q(Mi03M{vh;B7k@pOy@BDr93+nlsd<!uSyj7(f|EZKC+?d084PYv{0|rQurE
z(7+)jgGrPIBgLf6zPmI<w}5#v?11MblxnB=0yvdqSkxe}q+#H4sx!bYqrp@S8OG3b
z(BC7%U;%Nfw~*4?Rm6x3Ilw4P{^V+k2WJZn=G81%Xl3G>S2Mw(LcoS0U}?yJi7G0L
zpcEJqkf1L=efL>DWumh%gBf(da3ylu)PUTw$~od$WoEx!#a(f<uy@?RAG?wTR*VVe
z1_l_a>7Ylc&?g{+u8^jP$XQ^PWgni#vg2o(dAYCTJj^QR8m)?~4V#h!-ewgXn31u;
zRL_FpN|sJ1U>}IuVWd&Z^Q_I8JJx0n_?nh+hsSDp2cvo#cFT%u%uQ^V!8m`h$hf8n
z3Fk=Ek7HfsjUI!T4HhZ)kC%_RHiLw7EGGAX&XOzk7qy6cQr13GBim(=u#bnb4+P`m
z?+Zvz3G#Kk4slP+g2~3r&*Ng&sZe*qU>NrU8mkHhN~vI|W58rR`&*~HqBxwbI2di7
z08Kd`8!DrN`>8j(uu@^Thfy#pJ(Fo4TpQI_(6@V}MUO(c6XFVL0T!kk^%d02K*r+U
o)$s&6xr(29NLQ40HPG?D02*Lt<xyl)asU7T07*qoM6N<$f&k-_5C8xG

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/feature.png b/plugins/tasks/tasks-core/src/icons/feature.png
index 9051b6eadf384aa183f9be0c6d0fd90849cc44c1..26793add948f8012355c3de8d6c9f6466a9b85ef 100644
GIT binary patch
delta 447
zcmV;w0YLtV1=s_SBYy#(Nkl<Zc-mw5|NlP&B^XTXZMVaUmzD*Y0kJtQd4dLPuXo=C
z!ekk+qB2P2T#xx55C*YHHegGGPs^PddjCNf#KvpD;vzq{CB;6@3k&^>fLLj1slVuv
zPKP)5<{113VIcc0NDL$gQUg*8)Z-2}V0pQ3!r?~q|EHS_{(qlnH2QzC&Gi4(DJK8#
z&VyhO8zcsj1F1OzRJ**wHxI=NyE=TAU7T$B|MC>G|5v7(|GzQQ;{UC=mS7BGgTz2`
zAT_%>{r0b}@?}IZU{kXn*U?Enx3A2!{eN{9c6<ehk4^Udu%*>s8fzeKYxUJSG1>k5
z#pw?JvEh?b+<*V??C^`g8w>lpTyLD7?DYT46ij@m*X{qBY7a@A1}rXc7Tw+I{O|Y#
z*Z;>SV&eUsF8`O8xccHWU}>R4^v+i2|A+eAfY|;2!9EW#2C)zKyZztY?(%;{iDMH^
z1D2OK&f3xH`hQ=y`{&&qZXmV^5E}#8GeKfI+uZ)IDmZuAjMIRXrS@yKG&rVjs&nK;
pPjx^so~?~eX{*caF%6&u0|0H@IKjfLOcekC002ovPDHLkV1lZ^=hFZH

delta 625
zcmV-%0*?LI1BnHYBYy%=Nkl<Zc-ozkT}YEr7{`aKxvV7>QrO%g@uCR2H3)<1YF?L)
zl`S$z+Cq~^sURsLa1!Lmn^{pr;5Pdp(ZCg~b+ty4WVRNY%(dk{a^LUAwtwfmu?XJR
zE;{hzTpXU?bDsY>G5|8lz=*>yiN*enqBC6FPLNUd9X86Ub$_zI1uS1i6^6o<Q6!wb
z{1zvA?I4A_Xz@P<-+yuf;UtTt1cOkVLH`Xero9mu%ulFf@0tSIHJoAvmJ%$2q&V>7
zw;-D4@c7kyRnjUgAlF^Z^8%?Hk7Sldf?%8Y^ao?#3!EEzI4>!n^PU+T6X@!<;`jwC
z482ygpB#d&>wg;bCJUm896C*wfTW<nmW8g>&MO%Xu~iPy6v>5TvP|H}m<wOS`85UI
z17qmB{s28!$I)|T9QyO4=rG^GF@op)BG?Lx4*yYTUaPxBf;>}3Jk6t00peUj*kj~H
zA|zCnuYf5R(Y~O=Hdh0*PK{n9$T20HzH}FKseO$IGJip^9FNa|2#Tcm;9MK(T`IIp
zHe=^Ktx_x~mJlT~)1~rkK!ay1{Dm*b@M#?J9m0B7Ew(r|!yR@*JE{?9kR^h-U|zU-
zoA&^evkGjQ-G~-<GZZs&)IC+gIAatVXoj1_f=r<VUm#0z;P5>540Y2=$fs%`e_4ZC
z=Q`}M?P>;J=3$?Dm(bjl5Tx@Z;S*&FJPC}!sSiddCgiBMsj%aABjUL@dB%$H4@82&
z5yxVuX*fjDn=PS7lW&r~@W;~r`>mCxTWU=BoTbq63QNx<1^>%0KcnDazqAe200000
LNkvXXu0mjf<dH0N

diff --git a/plugins/tasks/tasks-core/src/icons/feature@2x.png b/plugins/tasks/tasks-core/src/icons/feature@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..66f44bd2ad51c9c5cc0ed478e39205cfa1d8091f
GIT binary patch
literal 965
zcmV;$13LVPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000AwNkl<Zc-rNc
zTS!xJ9LJ>~D2NIy5PB-;p_}(4%6Yc4i>YgKGpM&7L)2<h%PzXmQg_j*Tjo;dTuTG3
z$m`4<&)Q708)!*cWN6T9FFr)zum5jW<do_hZ3aDj;J4r9`}@K<|HJ-a01&p4g#9xH
zJf#B8G;39Hgm^x)%VNNlo9-YquZRIxo+{j3DEZt+aOJDQLvG+!fjW286bA^#AvNIC
zDpz&s(xxZtb^}7<510#?ft&fNl*h({Fx9jt0LCPj8Zraz=aue>tC2A6oCD+b3rcrL
z3^=ulZR{1{?7RBCFzt#AfU%e4NNxLHH_&ocX&5ud!lXS4rkrzNj5(|=)xcVJ3ANFw
zNeOSvN!t{})}~YP9o;(Fr-|BVm~_O#`{p??#vInL2YZ9(Q4_Us$D#%rvs3DtvJU~H
zi2}cN7x=V$z^mB{1LU_y69awPIPerCz%xTUyseK3Ed3eGVGVl%y<`SwQ3JJ56SZ*%
z+2vSZz^P4J({e`s;P$y>7%Gg0M@3Qd7|}(+)6!^oX^De34a9_fKA6KA_F!-DJZhpg
z*)dLbty}aF^pvJ=_L$VuLuMJgsEMDCg)Fe{gV(lwWLd(ZU=4e)H+UX3iS|ryS^Caj
zzJ$J-jF_QoM`lKCG`y<czbv2@(FDIG<M<z)0-r^FY^YW}J7!CQaod3<ff_^${8qJt
z(=qg0()Gi&hheNvKuF|?08nGlsv2i1l<PPd=r<}>6BFGdS5sj0nt&HLOEhNKO2tlo
zA0nfCgRfdK@x&^I=T?dnIODHTfY*HZ_>#Vaj7eVn*h0foi;xpI<2B2n_eyHSk__~e
zBo7Z)iD0CL<_u#v1a0SKa^42)S)%n_Mf8`!3L1v1#hhWvrO=Wq(eXEsEllgt3BhNg
z;h|Z~8K#Ve);#(iZv!_@QdRB}5%?-3;HwNq3f_w302nW<OJG1RhPDFHN8ScnbE&bu
z%VO}Fq(5LyG8ix=BP@aX2F8Kf&%KOZ0(UOZ(2$uF!P&s|6M`*mXN9x(OC`V>r7&QW
zeTQWXGHStTAvvsl?+eTrq|i}BgFP!r&e=diX5!Ji7lqJYPM)Pfg0LRFg!=8D4bp?X
z-)5lm5)F<VfsV5QM|PsEle~bQaxqJwIA1=<45JsbJ;fq$ofdR(HsI0-?A^s8iqEZQ
n{&$3?TJw@xerw>ry&ZoADfin;vt5vr00000NkvXXu0mjfi!{wB

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/fogbugz.png b/plugins/tasks/tasks-core/src/icons/fogbugz.png
index 70c2d7ffef5829afd90add6c70b8bd4dba4c1fb5..1b1f086720ae86c33e1a635eda960ede261ee431 100644
GIT binary patch
delta 532
zcmV+v0_**x2BHLz8Gi-<001BJ|6u?C0qIFZK~#9!WBC97KLa7)=H?~=#9crvj4Te;
zOUMAACdKGr*DZPRuD|2MTz3QcrbHV6R4iSc?(*r-6sP}3r$KO8s>?5+xEetNfQr}?
z!(ERbo(j=8x7OwVx^}1k9R)7`{e9dfU^M`!i3x~(QX*ZK)PHBWyxrD=uz7B+^Z(@&
zGX5`U4gC-D5{3aljVuY_u6yU#Isf0;htP<Ow|6@H-;|>EKfuGe48wr10N468ZBGBE
zR=A*O+CRzZKg=b|nw|g84ORVoI#%Roq^G?siUBRTE^qovT>c-Pg2m=ur~lb;t`C8(
zv;|`3$-$Z%=6{5$ZHF5G6y%v*?fidNKX#{sa6zK$4y3SRZ3)!705<>_C@G5?oN;Of
z#YA|ZYcE<XnZgZd&v*HLa5ARGBU2GH&<mGhyzI0?JsoU{{7iFE0x>Jrb>sRDXSo0O
zPIUUezRmIff<)c_D_flZ9{?IYz0&#r^bqxJYa$f>On(g4oR1L;9`0^-$&s!r*S0(V
zpOJ6<e{+=V|K$-%|GU$ye*?qk@8WRfpRbZQ{=Z9R``;3%{}kv2F03grz}GG3Sd8e8
zpQ%j$Z^rZg&+@U1fcjZrPN?eD#sGtEAe#ekQqJ<Rus9qe{;SI0r~+R`gBw5z1^^1-
WwSs{;3=NO~0000<MNUMnLSTXreGb3?

delta 792
zcmV+z1Lypr1f&L#8Gix*005AYXf^-<0_#acK~#9!B~n>TQ$ZAc@yA4oqJ9uG;s*%9
z$cGEOR!do)Rzau;t^N=eAquvZ7TRhBH_*hOBvM&i5K2o$BrZ|ok7<l?`7uEw68SUY
zLLwF{mcI99-pq9#PBO{doO{nbch2QNp+J!Wk_gcS8j~rOB!5K~NfgxM?`j43!ybPD
z6o6P{ngfC<#Tc*z^e>hrjIn|#W+>QdP04XwWwG|-_!tX+&&>gv=LjGI1Tg{vjGF<9
zG!OL8mUT<I-KL(#lK$4(w8WL6&~pYM6yp%c7$~J`ODZqw09ull(reWRTn6tEZTk`7
zm?^u&pi=<=PJdD)q{u|VEdDw9>Bg1QCH&eG6`7AbIV0}e<GHKd#<Xf7b-y-^B`~E-
z5~W0CF3Q}rBWc-nmuaBoz^#*pQ71oO*9Fd)I*%8$RqCuo8kQ5Ck8$#%?z)3Qxsc?w
z<qV$O)$h>xoASF3r*_+N1};>$)(B;3OIyoxXC}vD3x6_)B&tNi=?UCr3qRDN3%Yo}
zZF`_W>vQUl6({RA#SL~iAT|-|_E^mYjGAND*MGgaE-TQY9cknrIP`a{StBPjH$3|8
zvxjWeMwUQgsuji}!_>^QTF`OU;%(eH=-N7L=kM4BzteEbp$ob-*W5)eYt{dc!=gMl
z^W*80VSn!D=l8iAmiRoohFtupC(mcg4>p$#cnTjnGjBHStuW@R9T5DQ`VMG;jm^Dz
zHd1ZK=<}2go!T383O;MLzah__v#RfCR<FfSk-c&1<>Rt#srAKbr7Vi7qz~_29X0P3
zQkFh!GoLS9e;}UgG_Kv39^d0IS8ZNCTCcxbqkn14OBsLrdY1VxPY7L9DTlvj#Brzg
zB;2>~7qi!#YqEy!-JX0gcv`pOYGLBUXgerq8ZoCqjEERXY*AQY%<C?F(0u5UdFTIG
znQj#R0`fP2S&YQ6h&hD55(SA-BB=|_*6z!&w;51`L}!_$zX<%G5CITHiC~E!@gJaA
W0uhh7dmcFe0000<MNUMnLSTYW&wTm-

diff --git a/plugins/tasks/tasks-core/src/icons/fogbugz@2x.png b/plugins/tasks/tasks-core/src/icons/fogbugz@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..58ba4649742396a8aa693be9f0ee0c2118bd4500
GIT binary patch
literal 1219
zcmV;!1U&nRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000DvNkl<Zc-qBR
zeNdBi92c}S(!-;xOzYxK&oi|b4pH;qCePb8U}Fvz+Ys0s8%PSoOA!d9Ns0_b5KPk)
zDeEXK>bMjWORKB9(toNu|LDr|?E1s<^=O^4Z=c@-Q;cnHbL8$mch7#$^ZY)a@B8nW
zKtvPnC2n1W;U`JbGe9;l3yAXf?05-?1r7k;0#E<10zmjEPz_uH&I9$p!f_V>k_ezI
zMJ>51Z6dY4EKqxuKy|AHTA`5$_j-Wn@f6TekS$W5lc%pcxZ7~Nm7}s%B8`M(a@Ym1
zgewI3$sODnat}J|1+r$zBI?2_02@A@mLgsGtoe4rFWWdWXNcr16XgGEb47YFM;7o0
z5E&K$*eC}0q3I=IjKwG5jZe04)b-kMNCviZ^zH_pGSlUJSP-%RygUh53N)xy(gl`e
zzTBR*LZm~7dWd<aq<9T=HyOxolD&`~lz<V^Jm82)FS@Gi0_}X2r-4@AF=wbR5~$pv
zk#l3uI-b5jSaJ-qfae1ifQKIjzAIcQ(tEG-ehGbnRY6->G95$+luGF`_PZ}20jzFS
zO6kWfi1AnLoNRU1dY(?U2PdGVa2X9bBItPb3^J&f53rsQsDM451p8<+PqlvH?GN1>
zIXY;ZP1o%ablw_8j<jV5?kE7{^HH~MwgKyEjimw|+wPxeZ!J%oN(35RlHCnFm00As
z|5Tz`{LNYGRQlC2l`>VymOBY(?yMh9G@DVB6DSaCk8b1S+Gkx6{ejhdhcx_~$Xstp
zP2BMtMC{6(`xjgDDIirX{mg3l&1#;QkYL^3TrM!H9p0*{RI|AE7t1tu-{4gMZcJHa
z6o=SGta*eIch(=UPoj^qp1#{K_hN;1QNJ$%(~I-Okcd5~DUby`=c}P<m3;07-Lsc`
z2~gavfc)W(_lTd48VQ^jBLIs}qFr8IS15!`et0X#8qV23=7~1}eZ7r5^=#rp7Vvos
zM>>r(guRlySRU=S5$Uy3P-Lu3y`2MC<3c4JV<cv^qTQ%gG=P|^)y4gto04SnDFCkf
z^quvATVH8Pr2VVoZ@PZ;yeP^MuYvS|otg7oYc)&GHR>1sb1FB+jkVeSLJ*}=Nu8DX
zBC$|-tQk%ERt--Z9SVB8j;DU}Oxo>;r+v771yj=FjUy0aH;Y%W-}2MBG1Qjv6uImZ
z38nWj8*qWN;y8HYeI(@I8k}bOx7`xpEKa7w=2>LdDdZtz)hE+tv|tu{&taq{BZ1CY
zAEf;+%o%doBgu{DdQDG|6JDs$Ca?;5EYNX01u#}Qgc~2c!BdN65mlIyi1qaDtXP=@
z6Yc`sOqx{b4Ep|69K8k+=hH{cGu`CCwj;QjKZ#g4Qk6nM&?h2@D8+H=#;Kf#h~ZD$
zWK6e6I+GU-5m8jGP52$pO#9C}OJKG88i+qM#tyAaN!p9G86h7^*%`1-7uUzgFWT<E
zX_-^MV9?jc2i66k4VV{}4-;0yMQKaB*lcIy`wVlgGfPALo(Snw%$iAcdi?iINGM!u
h@8(l(jDUNEe*wVJiZT>2=Y9YH002ovPDHLkV1k`?LxcbT

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/github.png b/plugins/tasks/tasks-core/src/icons/github.png
index b2f329a2756c9b3a46f5ac2faca8801a3929e4e3..1cd6d256b56cc0bda22c6781eb59c605850df8f1 100644
GIT binary patch
delta 454
zcmV;%0XhDS1JwhN8Gi-<001BJ|6u?C0h~!hK~#9!rBl6X0znY=A@oiBc>onbtDM!f
zqBcH)7N#&*+9=A2K7zH1V6GBv5>1hCDFh*CPE@!QYKkv2%bl!xNeU0XV|Hie+u8YM
zJpeqnK>YlEzYH(ofiNZPZA|SwuN><}pb$P&snn3Z*=n`=Vt=sBd+f7gTnX-i!Qe-?
z+kKzU=ddj642EG~Fc=sd!?BkHT$(u=jb7XBHbS8gip3&Ytrj#*Lq4AeC8F2sVLTqc
z1p)z+;(ao~J(c*#C)H{-(ApKvW>ZwdvD_1x;EC_a&R8r4Isu79Lf8zpxq^5+E(kc5
z8!Hp+x7+Q3oqt?D_2H@q{eEBg*xqb5tjxicKv5K!rYTBxlG$Fb*GMLlV$I6Xp5=N4
zUDr{qRz-qCu-om>Xf)92bmS{MUp0|r5?x;|m#Ek42#3RnMx!W~%aEnDXX31hK9+_h
zs#GdaRTYs)<kWqZ(Mg_6CayA`28m~3u~?u~DxC-lg+GEwX5VjvbT-QAbb6S}<&F+P
wHk&<UG8z59QNDakGb;6)a3s9^`Iv6O57=r|>ZqJR>;M1&07*qoM6N<$f}Y9MFaQ7m

delta 381
zcmV-@0fPS31C0Za8Gi%-006c6H|hWY0aQsuK~yMHWBAX23a6!YmHc8t@X@4ShzPx9
z`g=nSr-BcBMrW1oK9l&scSG$H4;BR=CGYtDGxQa3d|wj;SFj|?VZYtMwu-!oCrm2Z
zb0(iLQn}6WSL<p^1z5q7D2Bf(x3#V^{AKuiz)t6~#PdToQh!ew{>nTq>IEyXI?4ca
z)(1YepB~%)Gw5BEditNCtAye2vM{I>VJjK_E{WRX#PBz1E=)mB0mI)_Ay5UkRMc*Q
zj90jSP2)d<&SjVh8+_o73|Y<gb4u0=k^c<8m_Tm$&oC*A;cwc^Jx)*sURyc7uL=Pv
z_|KqrQ|Rq4rgk$%9N$4^LahKfli@GV=Zf}UOq+aGg@A&3pIukU7B8>@o5L)>w|QLB
z^4QMs_nZNGz%hWF#q@Vk%pn`QgA9LfsbEpC&rahy$O@L<Z58O!P)8oHE9y;|JuU4A
b8>RvPsU!Yz-&?ht00000NkvXXu0mjfy^*z%

diff --git a/plugins/tasks/tasks-core/src/icons/github@2x.png b/plugins/tasks/tasks-core/src/icons/github@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f02f43021eea7b2b9b9849c0885e6c752949bc2
GIT binary patch
literal 1020
zcmV<Y0|WetP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000BSNkl<Zc-rMx
zOG{fp6ju93?4tG$_(E->AyyO>RCFPNB&Z0wQo)5FqPQ@ETgBHxT!<TW=R$}Lz45sb
zM9><P#@d*GV$y}u+SB=lnJ_nw<|Y;_bn%g!nK@^^InS94BFcD8Wc)J(a&vQ&A(O$z
zFvjqiA;fSm5E5f!Vohc;eW?)0VsJ5>Fpx!@2$`&x5_re3BNZ1E6nyLM?)I*&t?i$l
zo?c#GU*BC_UHv#XI0&q+uI^*5u(0r}LIkqe=@R(J5S1Ix&CMCNx3|Ayu^2svXf*nO
zwU7}c!VDi$C14Z2rK+l`9d^oCvW*h~%hcD`8-fIMIjj=M7ObhQt!)!0T3=tM<>h54
zO}cR~7^In*8S?pju*UE9_V!Id0@ln)Mj%W2ysoa!4+T)#)YQa%T2@v@3kwT$b919R
zF?l>5DlRVOYlnu0q)UE7ml6|M&k=A*pTmSwxx?WwMLGU6^YY*P{CujYs351)X<F0Y
z-*0k<5)<yH2q1UAVA1UCtf8K+p`n3NNI{OCo*t8h=I7^SJYbJZ9Ra&I{RR9k1&@!9
ziKSM`1R%4ww`a-@=oa&K9RXA^>gwv+RGIhn^`*SIL~n1e$qLXd=Eigce3(Q*QH5+a
zTU;Rm%<XnlM@I)WH#bvbV<UGDzFD+$l$4aj*O!-<n+QO+nERw7fO<}WK;XM7#LUK(
zArsEe&n=~4OG^uvL4c}r&@BjrbOi1&iSnunA@wkB7>4B{w6(RxW%Ba!Oyewl?`2`K
zOaNxaxXgWN-o#DS@kk`XziVr2QzD>s!NkM_SH_x;WdckG{~jG3P00m32+`?Oq07rl
zs;Q~rRnDplCMPF(8Xg@TJr#sL%V{W2<Z`)aaBz?g4-b*k+KoY$6&zj}H#RmN%_mDk
zS%`ut8Zdcvbu~>-PsbH(Z*SB1_&85DnSKDuGHYBkGBQFdD=QQZhqY}Qx}PgV@luSk
z2_cXuEiL5@NL4m4Fz~48u(r*E?<u!fDa9G0QJ9+1;^HFTfZcXzYHEsxhlhE7>nfku
z>wWTWV5J!)wqpaWl-+{(iILM7x7+R7%~2&;km*d1b}Uc7%kU=Ih2(AGg#?Pu&dzv&
z@%#N+0w9)10GoGqcB&VW_b<MZg+d`M0mO<*0A^=_s$R*Q>0C-<GA0m2um<{pjsSvi
zX=#Z^JJu>bkEC-cmB<l(i(kuGqxs1S(|sa=*4EaW%F4=zqN1V;Wqen-^i>`v?!WOc
q(LK#P42I@uW{A1;o@W2;>-Y~b>Ta>II_$;(0000<MNUMnLSTYtsNo#|

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/github@2x_dark.png b/plugins/tasks/tasks-core/src/icons/github@2x_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bc758ad325b9fbb81abf10d44627040f115237f
GIT binary patch
literal 1275
zcmV<X1O)quP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000ESNkl<Zc-qBR
zNl08t7><b^CNO~+7@Q&3<Ps4aaA|F|<JPU%t)L#<E;6IGiVNx?GLnlZD2lcRZ;Bw|
z?!^sU5Leu82Ad@3Ne<~4#gITursn^Os;2t+Ugvc(Fo$1XSN+RZfBjqCVvODTKZ*aj
zy1Ft$w}~Q&qKK?ScA{KCcCi*Ecy61~X%;{@(Zh?23&+5~z?1Uw^0~~+%(KMA#CLIV
zan~SxV-0)Y0WV~P>~{h9_5A$Y-qO<INl8ihJ2p0!nIZ5(2C}5%w{HOu26xWS&sV3X
zr$1K|zint}I2{=odAYW>_V(c5;M4y8{>O!dh1bKw!!NOynwt7X@<VocdHD}<HDRFu
z_`SQk`)NW#!Ut)XT<bkLI{I>Qa>9bq@$vCL;DroiEf&kg;NajB=+uHR0uY6J#N9$c
zVPWC(y}i8;Uo)&Fc&4<p)C(QZ)!W<qm+(YT0FiJRP(#q|cAw%z<X%RnV7t4!Up2hB
zxyib^y4d*mIQK?PP0cBE!JBh)b8e9(x&XovH1f`ii;KNb0Hyi)`TS08HXEapFuMC2
zh5@dvt&LGeaNee-CjXT{my8J!nBjT=9w2h%ox_DvISi{&j^9qFlmCy8k7pSf87wU=
zEr6%Cwl?58WK1+SH+x`93m}Yg*G^2Yz(g@{rk>8_axt?hD5<itGQdL~kH;$x_X@UP
zQw8u#e}8|QVDL%TgH~2n5Xm6}fXwXdY(REEH}+r)HdO#osAAYeF006^tE)pcE~%=j
zD!>cSjdj?9O%;HZO6fCfqM)ck$;rung$S^ck`gFj1qB5xFE5YB0=~=2$~alAR;Co9
z007X9^{lL{XRxUP$U;5G=KA{jxhjMp!#XlyV`IZq8Wt55aT&;}d(bTo@(vA51&~X{
z;uAJeUR5EP0TUAwri;+j)D#m1C}5p*U(3P-n<@aO5dgRu>xYMj{I_(k)~LEpm6Lzx
z<m3bc;8X!PjIN-)y`3vtU0pQ|0KE8aZEX#91r8NJstiJOI#p<Udz)ovXY(p&_6j;W
zI(Ql`EiLH=A#A~>3LwTP4dscboU+EoMz*-Ph@93nytTE(sEhK-I669dV_%boF)D!j
zN+EiKq5-20hl6!?cKQ`ePfv4CAl+p8f$&Y8k5MUSLqkJ62K3rAbSs7Ez6v1x^71lQ
zmSU7md2$*scmq<E)z{bGC^~k#UDvQ)DTXcB)Hb7NGzx7q>g(&{1}Z8l_}vnZzcy%T
zY;4SMHqbPqXuWRu1GUOr*^a5=@pep85I-?;T7c6vo|Kft-LL0*=n|Fjh0o`6lC8T&
z1Ia@QvOl#0iAW({U?wLgjRw&h03cgeSLYu{W@cvGVp=wwh%mERf{kQ5J3G1n5GyJG
zF_N9h!qd~!(+=J0Txc{CMiAM=Q2J5E1cC@BLO;+0fFLB`{M6u8hSEzhl-h)DQ&TY*
zEtuhOZ|Yc1jpj3z*lR5SI_-Pva$l%-_>^w=0#_<d9uexpgue|aFkRpBFhR6K*62+T
z%G2y8qD0EwJj4bSAw12zI!`k%_P_&P$Ozf*ej7@<NAyVCB~r<yA*?+XJoo;~$EhCO
lA^K6A@MrOTCsaMK{V(O_T*Cn!6oLQ%002ovPDHLkV1n?*T(<xK

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/github_dark.png b/plugins/tasks/tasks-core/src/icons/github_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..97224b46d1a78db31d01a141fd39254f6ddfbf23
GIT binary patch
literal 600
zcmV-e0;m0nP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006XNkl<Zc-n<i
zJByl85M7emU$Sf}pQzxcDCjC;n}Dd5jcB2E7QWXXpq;Nm6h+k1!dSRIF+}_UAq2Kd
z$c6|ZabYs&q95vRNHH+?&YW{+=FGiPDwS8KMnnp>Yc`4P_F&TCPH~xk3Vg+Ov)yjr
z`h32QBuSsuYV{u&eB2?%Id9lrpAj6u+H^Xd)9G}Nfk5EC)oOj5&1T=G)9Jq5Za;>@
z;Rn55ze5h^>VP>VxXENPIfKFQwOXw%Mxzm}*XuJI4u{liHi@hGmCa`FfDr`f3#IYP
zKf2xStWYQrmrapKgy83LISPeB;;vjSQ@`IQqtW<#v)Q}@76jK^a?|hk-{YlJDn-ov
zqUG~>QB5osqhK)j9#{}?RnjN)jG)D0A(cu+Hk(cOX0uuNsK9Eq3W83jLk@>y2P_C~
zG3n)U`5i$dRw|WeGpN;SA_jl4Sddn$C17O&Tq5XnI*BJQN<M<&&*yUy!x?c_1O#@u
z1(xb3f{jLllF1~ogfhWuwIWuDN~MzAg4^wWVysCXB2W6EUayO(PbL!qFquqZ2Jv{D
zPNl_}2l?eVL<J<ll0c$FB0(OH2W83Ahm1$?U@#CdZaFDrJY6I#Nw3$V@pw$pX!IEY
z9)J?XVsR}m(#0y@VM$OTw<QyJy<Sl^US{xz{eEveTjk5oge9@t?K_P|Bjj?qTu<nk
mrB1&1nf~*g9hmmNzVlx%;8>fg`k$Ks0000<MNUMnLSTaB02fyP

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/gitlab.png b/plugins/tasks/tasks-core/src/icons/gitlab.png
index 12a06e757436504e881d6960c7d0816ffe472358..b581196c21f8b492bf9f077cc1c9700b9b2e9b4d 100644
GIT binary patch
delta 493
zcmV<J0TTZ71cn5VBYy$SNkl<Zc-o~?yJ`YK6pjCoBI%P4$WP=^h(;0Am_`IGEVR(V
z1Q8(^5KW;NJ6j(JA|f^xiA91S5k=Anf{hw2)c8QeJ-IWetOjkoaF)Gi@1D8$%*+vh
zqeH+SQmNEK2op}lA1S{ecnJ~_cS3k2Jc$K-sZ<J~Q0P}ClYeQMphBVeb~>FxBocvA
zsjL(CBA3ezl#dgM1So$N3*1DbQA{Qi#9}cN3I)t&Gpu4dog$ylBb&|gns7MG1g^va
z5{t$1nakxc91gK727>`InG6gD!^di@^}N*PI{|978i7Cnl}ZJIAYidrpj0Zs@ApHc
zQbDWLf=2n;Hh=Lp7!1PW@vzp`psrvv8aFsr=kxj4yGAVVR;$&}YPDc8nbyU6y`Fcp
z%FSjodc7XX<uc2QVu5p-tJm#zF&>Y>cEoD6a?|4RIBYf>m_MV@2%S!cEi$2hE;l?N
z;@ahM3H^S5y#vK!k$b^nKA-ar-EKEq{eHs(k;tRh>t;o>+2rQ2U}Eidn{&)astNo%
ziCZEM4u?ai*Xw-NMx%jhwF<l4j^&A!>=jsw$aOm1Pdc4OGMR)%qZtx+xAQLS5IH8q
j2?fI0-ph3GZ9D{j$!EK64D;al00000NkvXXu0mjfEYIZH

delta 604
zcmV-i0;Bzg1oQ-uBYy%rNkl<Zc-nPS+fG_h5ZzxOkJ4|kAHf3;_T7GkR{9_n3^Y=a
zM0g+;5kf$sR!B&c1ZWUKLP8<|0wr86YRetD$?BPH&Iyn@$<Eoc_pF)OYt~_%P6zdR
z9b~iFY~f4RYPGn(d{?X0(C_uYLZJ{mXJ;@T94r7E4-YWx?|<W~UXMaPFP&42!C=7o
z`8ne8I9Mu`!tL!X9v>g^MXlz0y-o-F$q7oO5?)?j;BvX36VAfnFw{FcXf~TjBofGE
zGGNt81vl5%_*E$2vr2_(wTkI<ie;lj^i<v69`Zs*KQ1r1&*;*8bcD^#O^nCmg;xK!
zpG+oDZEwS3v43!%Como!;`jYMKk!{$@fJm(2rie)2nK_E|5v#GCh))$5b*o)F?Wnc
zBV;Qpcqf<RXC%VgriyO28}ijv$Ye6k5t-BJ#M9Fg*u}*KipAn9^Nj}HudQ*?h>u(@
zhiEj4j~g3sI8LEZC@>n0cx?La4nCg`ED#9raSR3n-hb}%^Rp1_z^AP(q|<5m{eEaQ
z8rW<$PA+vd91cO#^LRY399XSZ9^7uXC9){ECkTZS6G-HQeCpU_GI5`YB+=}%*{q~I
znut=V#E12DDM7#A=Y=%8yHY|XGTrTVq19?p5p+S7>5K@ZB|eQbvnRyRltdhx*ElT-
zhzN=!AXQbPMHY+2pb@yB_s?V4JXmbq>-EB7HcNaEM>IAOJg*P7tTyqROeS$^w{s0p
q^|$_3Hm~>P0D9{mK`d{9$^HSBTaKp$QNT9<0000<MNUMnLSTaX>mE)3

diff --git a/plugins/tasks/tasks-core/src/icons/gitlab@2x.png b/plugins/tasks/tasks-core/src/icons/gitlab@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..011d5d6bcc61f25308b9896ea907ac40cf689250
GIT binary patch
literal 1161
zcmV;41a|w0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000C~Nkl<Zc-rk(
z*-KPW7`LJ#kSKa7`Uk2fA0i@p2<o91_cbv^%u+Ob$PGnsLs483Bn3ApL2<<>6;mHn
za7lC&hjAW6QNvNuao=aYzTaW)Fi!W*jJ6T<!H>Cf&pF@sJLlWZbs{3CzX_-R1f&O7
zSJzvNK}HP2*--^N_des11M{vjUNgEGcjX8?%*e=~?(S}ij*ed8|B;L{HWXg*^78tW
zo107g+@UlV?->#C@$s8|eSHKQuq8*prL?q^v|2449UW0^Z7s2Z&;0(Hg`&rd0yj6e
z(TIqM1C>fekmBNE^7ZxA@>mrkfN{yR=0;#(;Fr$MPBI#ew6L&1X=!O7;37xha!yW;
zad>!GOomKNO;Jot%r_p34G9U+R#sNh#KZ*c?(UMc93CE$TCJw?@^T6e4%YLUw{dZC
zdKi@i<FT=^MoSkTJFd{sP}TPKwlD$#5u8d(OA8$w9FU{3zrQcmz@3t4G#Xl3S|V?6
z@2`qkz|3Cs_V&`u%#3hDYilc6?%<@dxVR{GZ7>+bZ+(3|j{lV{0_QmZ)w8p+!uZzK
z7X7T?L}3`Q#qpql4V!g<C*0;^A`cG_N>5Lxo}M0Yq^B|5(a}MPiHXEPi=)Tx@7XOx
zJn0D*@UIzuetuL~SV*IzqvAM~1aZ>e-%r`u*~p+{I{f|p@f&5608))3cql(V|JY(n
za5hjyMFqi4k|1c2ihRV1>#D1(u@Q}Ry|5<myrH3i1_uWf6-mG;)z#HeUS6Kvxc~yY
zq@)DTo{9u~e0+4PtE(adA|oU1Ds^{vcgT2ZYN|LXolZvq0RcLceYry9-PqW8EN?wM
zJ#8vxWp+sf1qIRa^0Ls0_%T(&XL1BSN(7`zh^lA`9$CQe$;ruz<6&W8=2($3$>iQK
zIRa-HIS3XIKoNngtgKK$L4in1YXjrs<J8{X{=<8auBxgsm+ZB*HQ`pICF|+oIZqYS
zkb~>}(9n=zJU>5gb_rqw0m{8WxCSL!N<Ho&#PLH32?>JG&d!c`9X5df$P_j{!p1My
zs{_vLw;31&^SQY>*_;PCbVC3&UQXb9=viN1C+;)5tox2bHzM?Fu3!dqIP?NJ5>U=9
znUa!{Xm4-thjEaC{}Fh|0`!>^UCDUCo2;xX(PojuQcPG1{3->krQqaHH8ECHR0QMi
zPIV{bg&8QTAc1D0*XtF_FpQ3jjEK{aN;b+j>!@R#JN2cM7iZ#_H#av$TB6BdXOokY
z!aZ;W`hHhemmrEc8yg#xl9B@BAFR9Iscyxr<YiP;)DdC<yMrOz8_LScsJXdWR5*}=
z@#*Pl3J(v5@oZan$`fD9(IvT=EMd1uDeJB{Ha13WZEa{cTb7mXmwp$p;_J8pXJ%&7
zz`%gnIG#<BuClE2zvaWkR57D@ryEU8O;l4;gU)E+ce#v<f9%VMjooB4GSrL*|Gy3Y
bSpweyyOopV0E?iO00000NkvXXu0mjfkYy(n

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/jira.png b/plugins/tasks/tasks-core/src/icons/jira.png
index 5375c427edc008f856c923c1d55d492d3b44d278..f6f1f416b09f066949e4db7db84f7cf7f040b147 100644
GIT binary patch
delta 300
zcmV+{0n`4O1;zr9BYy!6Nkl<Zc-mw5|NlP&B^b`ok7$KqWgzB)vbO>86CjocVkRI~
zhpEG5fD;h^1LA{F{#qcu3&gTOJQ;}p192Wc1Ehd>JrHLhxd?`Rpe{1TWx#SE_6K57
zESh0h0Ej(+co{YWjzXRI1L|ZysPjQM28bnq_zP6cX>11gL4PGdcn=V>LS3~5h}nU7
z6Ow!ct}vL7q-Y5cvp_?C3X=F*e1XUY#JiCcZwC1niGKnX#rV<zC)AezXm~#m^ASo1
zFbs0`L^K0zkk#NbfEkF7193DE_aGT?2Z%X{F(4YM;V%%o0r65KL$Zl6U^7(l2Ot&!
yVjduVi4+b54JEh^RlEjCYyvbv9mHt>xflTXf&Hps2?1dM0000<MNUMnLSTZLEpx^I

delta 641
zcmV-{0)G9*0+|JnBYy&5Nkl<Zc-n<iSxi$w6rG~}`XTyZB0q)%qoSaoKWN+{i9Zq&
zV{oa~)(1pF5L{vm#wtnzZX}9n6l+9W5tk~P2xz5<T8Wghgh+wZ(iW=hw6w3sc@z8c
zpe`qwyv%(wXU@3`fdqcPA6_31A6)`!KDHyL=oO2xe_kK^N`FD5oAF5x^6ymPQpsz!
z4^KD=Sxho?`WDoF>OjWDhxlf7PA8BucJ$a0z3VI%Z95L<j}esBe!;PVQrKN1;Btx)
zLdk@fR54S)^E_+=L$Er3vX?3it(c;6r7(3_QCed}k8Kcrb{DfFS`a+nt7yVHRUWf2
zHsMBZzYFE>O@AnFFrkHBc6+?IOV1=^6(Uz#!R$`UL3N`UWQ7uB*?!!7rbkzw17Xz4
zf-PBiUf+y*V<%>>NdZ}$1nr9k@V~8#IdHg!u|4w|NW@;u-<*l=?*q_0d5hHC5)2NF
zB36DLWQiP+JJo2n^#8dEx_4g@y6G@TqykY%XD~cA34hO&7xGhDkmU-HRR>Y{s4h5(
zQk>T4FlTKlwQ~S*$~;y&vUDFvw2Bhl61@kM6DeB&f^0^zQpsMH#c+sEy8;I-?aZ@e
zW+w`maC^X=D~4<}$7Ijjn1SjK=Ag?#1OXJ>e?uFl84C4nreIcVGWKK_iJAW=frVy2
zA~74Gw0aUk*KOb~u+lD!KZ2@8^WQB5f;XP(F?W4BNce8leeOhCw+$gw0f|!K#MQF@
zD@f0Oz%C0fj*h!oOK&}N86<265|3UFYVja~N`o0{%}d&C1~$e#?}xFi7mw*2G__j9
b83^DP`fN>Jw#lU800000NkvXXu0mjf((E47

diff --git a/plugins/tasks/tasks-core/src/icons/jira@2x.png b/plugins/tasks/tasks-core/src/icons/jira@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3825b73930ffa01092c22409574448a6c34cd3a7
GIT binary patch
literal 645
zcmV;00($+4P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006^Nkl<Zc-mw5
z|NlS3Kw^eL=K%ePR${Rw5MKl0pFq4Eh`ET-M~(w@fjAjTBa2@J;{Qmv1WAq$h+}}*
z8;F@GaRA7WzfcSQ0C5PC+yyiTWI@Hnf%q|!_!>$aunWzSZAfw&K)eTt9|3U>5VJtV
z6VdeihlU7Q4oF8cD20f4mIdPXNO}%Xng$$!xCV%=Nl2h_KwJvMNkGg&ssl=(DV%}I
z*Z_!&iE+SZXwV%8;z}U)0AgV>ECgjsD<IB+rj>s{{DT+=?8K6Y9sn^LlHs6ye+CV2
zMapuZ1bG9CIfsaGKr9xGAY6dtfZ15&_aezB;V>hM7zcoSdLN7CFVL(9Q*#ta?lurh
zK;@)?_zf2QFMybv*jx~R!w1)am>;SJL>~s?b5KiR@qPk_-V{=^;X)h+oj@x0nb6{W
zBMv<~fS8d~2Y@WOh{M1GNFf1>lGQlWf{JA^atk6EAijsgU{K1J1Y#a&4#1}719~M!
zPD!W&E$^{e@ES*g{SPfqY^YHkgRmkH-@;)LHvA5V&8gKMfMH>@tcMGO3N3AFHb{^$
zsA5?~zyW5|ZV@447HD>wipK$<1j$Sb2LuE0TWAFXa>PVDjwq+L0|bEhCDib*K<ox}
z#3URJ_zuL%)O0`-ngu_A*a_;0wKyCxpIQ!Jh30p33r-`In3r*cf*>^<;EBVBen@JJ
zpsi+fHSyGNKqnT1k77}WEh^?v!vWi|7+i)$T?!U;hpFL!HE4$ZfhIt7bvn>$cQ+Dl
fB-sHYu6GOoM4k6_0YL#W00000NkvXXu0mjfws8XZ

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/jira@2x_dark.png b/plugins/tasks/tasks-core/src/icons/jira@2x_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..33cda03b2b276db88db66f34292e64504352c4a0
GIT binary patch
literal 636
zcmV-?0)zdDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006*Nkl<Zc-rNc
zODLvM7{@=Ck&qcFLoOv2Qz%)O3>y{`DJkqs)9}@lEaaN9F}tbRP*#+z6lP(88J7}?
zB9RPHMrLDjEyR@Z`k#8fdODrM`@Y{1W%28)bDqopJ?DAOIiJU}EYD-&d2#|O>O1X{
z1Ac*jpdW<U@pB^}160#5A72L+qmj);f=W;f0{syng8Zih*Pxuutw;iDX#6$!!^VgF
z5il+#8D(>Cz$DlM-#{>pf0BGGS`k+QK1+eTHugCYoG_nhe`_Egw1Hd)1)2n!Kotme
zDxi@n++&zb&|pWv87<vBXa$8J+C@UqmhV6<)yfUHvLoQ9qKI}u2n#Oyeo114wVWu(
zO+}m;I|4o^90heuK(}Ikip^JPV$|3XAings!ugz9&u25o=C(mB&BcR5h5tSXx7!7!
znlIP@FUdyy&Vpr1>f84Pjjz{f8}?}eEwFPxP}=uljn5Ad;8cJ}vZ@I<%~ry<C4(AU
zaV*EUJ%|#(jwZ0E{5TLn9iXx~l`k<jCt)g`_o@U3nu4|HJjpY09Sf4dmL`#kWAN70
zd%#Du)OtF^p_OLxLBbIi%fLMXvQ58;IKk9TU3Ul&1sU`Z0?NP<T`)pK#~mVCObd7g
z{!;J@@Sa3;Y6M(@6q5qJNC~b$0g3po5z%W(zzgbkIl&@3G1oM!5M@F@k>(3am`xVF
znq`}hCIoy{1fEmaskWlWgn%(c;AVxLS7A46Lcov|^qLA#wo9jLcY@LGSirOUcYF)%
W&%vaRQa@b)0000<MNUMnLSTaT=M&@r

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/jira_dark.png b/plugins/tasks/tasks-core/src/icons/jira_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..876771437d1424d522863fda6afd3f2acffa4b05
GIT binary patch
literal 326
zcmV-M0lEH(P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003ENkl<Zc-mw5
z|NlP&B^b^KEt&+w%0SEoWp4xGCqOI@#7sb}4pWEA04E^+2gC=V{Ix)Q7l>tncrp<G
z2jV<@21o(%dLYh1auE#sKwV^v%YfxT><`4ESTw`101$fs@iJ@%9ECdZ2h_=aQ0Iei
z3=m5I@fWC?)7T8~gGz$%9w26gx@rp$vjg!aB>4zjVK5&_(GnnLfrkDRB=NQQ0+9`f
zcOxm@4Dv4${{$?G@udS!s4f4|@O~iXBa{wc8074UXa?9ItHEagGY}sK;%Ff5K{DVD
z5OWY?Kr~dtUm$h^;-yH2WD{e+W~ky1Kr8~pJV5*sDI5qIa2=|64U*UdXo5P3(*SZY
Y0L^wVK@5`(ivR!s07*qoM6N<$f=8Nq9RL6T

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/lighthouse.gif b/plugins/tasks/tasks-core/src/icons/lighthouse.gif
deleted file mode 100644
index e12b528031e664e897c804633632d7ae103560ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 664
zcmV;J0%!e4Nk%w1VGsZi0OkMyf5Gsg(dmiB@}<)0qR{7n!ti{)?tQ%LdAjL#yzQ~x
z_O0CYsoV9Z)aq5Q?MjrzhsN`R!|{K>?tZ@Pe7@~^z3zCu?@XA?bhP5G-u9~6^QYMJ
zsnzP8&E-p%$$r1?dcN&-v*Aag<xHB+O`FdEL1?So^{U+UPMpzBo6w=p=1rW?PMpws
zz3qFw>`J8Qf4Sp>#PhG-_IthVtJv*Jn97F4@P@<gSFY@;-1LUT?|8W8O`6W2&gP!X
z=2)`ue7NOxw&qTq&`_%Cj?43l#qD#p>P(u=SF`c0-1d6D@UGqUfW7E|z3PF!>43iK
zr`GL)zw3g*@Px$iPN?RE#qxo|@PNSWbG74$!Rb=2@1)V^aIoO3-Swc)=YzlLdb{UJ
zr|hWM?@pV~s@U&(x#v@`@JOWRcD3Pmwd8lW<xH5%q0i@eyz89I=AqE%ORMfrtnH`T
z^LV-FfWYp6!R~><?t#JYOQ+|2yXHxg#Q;KSO`FgFL1{^o#Q*>QA^8LV00000EC2ui
z01yBW000N|fGa2{EGsD~e2IxHBRp$D3|$Nx8zwm?3@0*68X6vaCIuA<QV=r<1yvAM
z6=V-%CrSWT9~2-4Rxz_WG=3y<7E=N)MlBL|05fz&91kN40udiA2QDAhHaATJz6wNt
ze+CmSeSH#rdk6u}GFspt6C!(k4(JC1dLtQd;B^#d=;oDp!i|IpGvHjb8G;T^IVJ&o
zB|!qNV!1OVO5}N?=ZJzIal$yjfky;_7gWGt@$!Jj0y|eGL~$}Fh?+7x(xf5a=Ykjn
yU$OwffTm~&E+JrS@lyjzg9aQ3bYP>xhZ`R%2=vh7!H-uxejfM%>$R+&Kma?>31VOX

diff --git a/plugins/tasks/tasks-core/src/icons/lighthouse.png b/plugins/tasks/tasks-core/src/icons/lighthouse.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb6dc364a52eab2a41b45bad4cde7129ee122117
GIT binary patch
literal 847
zcmV-V1F-ywP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009PNkl<Zc-p1Y
zTTIen9LDkYqSZw+o3(1oR-1HK&5LFSU8P&=LUU_bc2HCDkcy!$(S=j8sY^40v}su;
zMv5S48nhOQ+DY@!R8$Z_Q84l_JW*+uJ^kwfy7%Jy?tOpn_PKgr0)VWfe@ji*7<tiS
zA>4)`!fzZQxs4Xj$l~Uk$?T-2<dpa(<|Acx!t-ID{N_<o^u|aU1|~_z=!^ppcbbSw
zJ5G2i<K__Y=&NwP3=Bpz=ut7Chn)lSN+80yB3zc5nr<tH+`7y&q|@{t@Nw8mD%#9j
zFFn&t?qa_Nv#1&~rW$BFo<cv=j(KY@vV=11V960!+P6^k$>Oe?usMJh!!%)3=?0JG
zs<7q^AN0c4z?TT1-JiPtM)eD+LIsF_4t#Rz5mv65l5~za0FFW*<a@sz9!UbMKEng6
z;vFzohb5DMx}Kt%15fc5s{(k~pICwu{13QZr%$m1u~oX3V_7e;m7b4-ECDQ*E^7Rh
z%7))d!@!ae-{<<^mr;%l!F+gfYQdBZYVAO%u+MrlU5ZVi1@PmP0l)Rs*ox(!CM++F
zQ2R+LGa~Ma;B+w`Ua4Y)l&P(DAXuQLfGX^cErM&j1f{}<SZvOQwe1P4?E?IGcMGqi
z1)yD%U}ww&3aCVopnKX5#7K08BN?^W$0&qTq7t#;ftY6ysF}{_iC>S|ID$Ljhv5=0
z$KJSy@Jg>nM1|ID2iPz4Imfwg;m$0EGgFRRsZm(WbjH998kHMtnJ$oVe6cM-ial|~
z@Xk?zRcjF1fjp&QU9hkp-dPH)jTC{G6bM_I6Ex{GXwqnyO4|rU@?p3}72^O$j(`$1
z%396a?Lh1BG~ud@!M+c=u`9C`Poq5Wi%wvOUQM+Iw#x)>BDdgBh5|lCec-A_uJwPO
zbG!rX_&llX7$bCHFa5k|WFeMUiE{Q?)U&+MKqY3M#?`!1oGQ~VC&+Y(D$N8@n`a$B
z7j=02ew3tCYY4l#*Y$#Q{N72)On*SBX5w#tqN#xkHP%O*IxX#va*)V-#z}|qzrV1O
Z{s0A{uvV!u<?;Xk002ovPDHLkV1lfBm_Gmj

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/lighthouse@2x.png b/plugins/tasks/tasks-core/src/icons/lighthouse@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..99a00441fa3ab6b3eb8656387ae3ee0a88ed500e
GIT binary patch
literal 2322
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

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/mantis.png b/plugins/tasks/tasks-core/src/icons/mantis.png
index d180cfa545c797813c91f1ef283b9b99c4d39640..7e783936ba3e1f2849d0903f554fb719b3fbc7da 100644
GIT binary patch
delta 709
zcmV;$0y_Q62HXXZBYy&;Nkl<Zc-mw5|NlP&B^XSczI90{XOqvGs5LtOLHPU6AFM!{
z0fzIp_^bqp=Wh1fwD!afmtVhsF)}bPAPhiO{Nnu!F_7Y)zkV@8#r~hXd%_A?4Gds4
z0EAbbn4cCj*Y;8Ba@~&!OI>g6y0|(FS$_5Tt)Zvy9d?2nfPV~bT%VP4`Y_Mmrp=1~
z>-VYtpR-Hq|Jftl|F$0KuK>xv`Se~OaHZAzwjDm_uo`gXxX#_lJ?j6@oZ|i;yH@-E
z%j?Ylr*!N7U$a^FE=az4cUynu9<~2P>okAC4LEfDlqt-BHQRi5_cyTq|9PF^f8q?)
z|F6z6{GZp$`hS1Y=DbChAK%bU*r@lbe5>03^357Q;Rd8^(EeMrsbt~%&mVbSynii}
zw>WmE#$=QKj9s?>^`{#B51AW#80d8Vj1BPz>h`JqFWs#6zh#H>b+`fLn+!fw0i6}I
z+V$4)J7-P){Q1L}yS8B(OO@4skygi#GY>aToOfbXYJciREpRlauGRcM|5(jbxB+vI
z<t-`Qr1ro0pz8m)_4+@0_DwB6e0`gL`s$1g+b$k(j#=S(D`2JdyNCtGpR5-e{r6s}
z|L?+s^QLeEZa=@OTen-|SI&Bk|6xmX|K)7c`t3f~<zCwAjIE$Vr8mj$L*+j8|CW<{
zZ^%rw_<x_WE^i}BIskz!7Z#>RtkL~zKHvDi%@mhA#alIhWp4~T2a=nxzhG(kI;R`*
z69eyxP4IgC@byz^3<E%5_1Se1ic{@AvG&;hbDtQqYt_jKr6BPSUp{e8*}F8EsmJc`
z#!CmhFj68ixc=;(lH=U0ZH&Ek{|?<gX9*LZcs^uBR_WGBEy!xI8UO>^FCVchSl!+F
r<JV7S5P#LN9iD&w{$avu03{dz5E2j7^WG-d00000NkvXXu0mjfPd0@K

delta 821
zcmV-51Iql|1<MAIBYy)DNkl<Zc-n1}Ye<t}6vy8_RD={I^f53$n0edW-nn*h7kAM$
zHzWl$=X9IPnL5S0t`>?`7HCjfMr!6ILCx|)ZUy>5DG>V<RHi7Jm7pUsYg6-d9<ea-
z!;f>`^PK<xJ@0c~Dy6}EGBAnh)9&h_cG9uU-#pY9CT8gAYk$Z9(u_<X1}a3)?oyPg
zSA&yTSNAd@5nrG>lPQ`DNoGf)$d}YG1|oKfkwTB5__3xk){Tt~$e~?gA6bcN1*3E?
zb7Ii3-KZ4h$rqRg&LHNekP}FNv`{&Y@qUM^`@iY1rm1MIG7<v^BHS+ei}U4QM0v6$
zUY2-KQlMBiHh)?GO^fjC;0`fcUaDG-%8Onk2I0tQEba@^g%%l`GB%#LozR2ydYsU@
z)CFkr8}I5N_UtEpfjZ{E?N3b*tYd9ZElZsg01(&XoOJ%`<XjwV%=m+2hy@M@dn<oG
za}LN<VHQCU-k0KRMa++Gw*ye)q3}DbECbie)S7WLB!7jTf>}Sn+XWJL=Hf!dWLjIM
zR#K##(9R}7-FzdNV1-Js>wuNUeX6jlePU|jCC=wT-`A)8V6Z;~`ul=`<io@CFMW&I
zrYzUg>YCHGOzXe30q=t79VN_=g7#}Na5DIlkyYB_gr-ytjyZ(i3<Qov0D?T}c>Du>
zuCO5Dr+@He6tsAH!8n=?%3SqjDz+?s{jR$c<PI&UYtC&53Zzatoi~amYdGR7WPzE=
zakDMFsf1R;*4rzW?f}C;zZIm5y{JTca?|-96V$p}0UIH_L<WphdXvuNLv&r-J!Q3~
zotH1(j3`$D_n8bTUG*Tj5=nkKMe$4pMagqi-hWJUSYOPeM6kJPpnSa%aIL_($OqXC
z^*AR-V3k#?!8B%t&}=TK8{z=hZ6oWnPTMHT^0APt@ECGaXqT<(-(*9<+AZJ}Nj&T<
z-X*f$(Dbm^{8H&={D=t{Cb|=Ahso-RmNI?F{RbY%8D`Fl@Ja=+vUs2I*>}4hK<5hP
zQ7$}&`H`I(a=06BBo-M#t|JGKK%}1-?(Y8s)Bews95M?d00000NkvXXu0mjf(GHWa

diff --git a/plugins/tasks/tasks-core/src/icons/mantis@2x.png b/plugins/tasks/tasks-core/src/icons/mantis@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..211bd8bbcf839918466e99af49cd23e2085d7d80
GIT binary patch
literal 2045
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
b_V4&#H_j7NG4yqz00000NkvXXu0mjf@~hS2

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/other.png b/plugins/tasks/tasks-core/src/icons/other.png
index fb5256180562f4357a5622c4ad8322eb4f15163d..17988437e5203a1d8e727f404de8493743e519bd 100644
GIT binary patch
delta 113
zcmV-%0FM8s1C0TYBWeItNkl<Zc-mw5|NlP&2+x@_=RW~l?=fi)0|>+PfG`6I2Hb=h
zg4Y0;Eyx%uCk4dUL57fP034HS0J=eRG2lNIJn90vxd4b6@L-}0Ac$#W0J#_d9zv1f
Tl)33$00000NkvXXu0mjf#LOz|

delta 398
zcmV;90df9~0jC3yBYy#INkl<Zc-p0syGjF55Qg&t_SV*dt-YO35C}p_!6=Fdij`nz
z@)CkrB$bWW2woZq7BLajZ0?tho6RP>n`E!ycg_i`2%8hZ;)B!7_s^M`2!P0c_<kIw
zG9RHN(<R1w>|l|IFjm&$;R45-Ai!q06IjIN@dGw?)1bm7R(~uMwEHfn(Q{B!ZB)B9
z_D{38&bAQSzGRZ+nF5yD&>T)pbx@&V>2oTObr%;m`9QK7E}(W<Dx;#<D0M6pWef4W
zt6yxLoaaLY?7!O3<MasC^q^33p`;)$DaaKS$m$T$L{bVBjGYM<c61^7$P)`#Dx<4Y
z`oM*(xoFWqn}0-|<}wfoM)v#;`a^+WX!|^s(IMKjjV7hmX&W^fYL(E00?VJ<LC+Kj
zOcJy;m&5-}=|OUt?x8H(Vu3OC@hq8~Y|+HiyMf171NQ|TcP~0_b2?N*AkarXpE4)7
s2XhK5WOQc<j#8PoXyUB;H+}?Pvabfcs`NPD00000Ne4wvM6N<$f&<^Xg#Z8m

diff --git a/plugins/tasks/tasks-core/src/icons/other@2x.png b/plugins/tasks/tasks-core/src/icons/other@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8950bac515e8813e1869086be1ce76e85f852fe8
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJI!_nJkcwMxFCFA;FyLu@*z;Va
z=>f;CmghZ>a*oOAv<L;Ra_f2jLAkX_{>#LU34Jr4COI3Q4GH_F?#|EP)1scRQD9!f
zJ*N=nHQ%>f`hI!4w&1#kw|BITykNVbZTEnK#et(?j*cFK^Z~XFj5!aMOM3*S7BXyS
hIZ)1UZ!cd2W9o7@wGzGW7C@IUc)I$ztaD0e0syziMZo|7

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal.png b/plugins/tasks/tasks-core/src/icons/pivotal.png
index 1ae1042485d468fbbedd9d5b30eff6e89b0a9b31..7dcd1252a30a5133d67ba3b3e7a9d367072cdaaa 100644
GIT binary patch
delta 273
zcmV+s0q*{{1fc?u8Gi-<001BJ|6u?C0O(0XK~#9!ty4J?f<O@DHO3yHsmEXZfj_V$
z^eO5GH1Pw<0xBkIg1dp`RaiCBizvu~B^Wd{HPhQW+cRiHq!oeu^d?)%1EoNJx}zcE
zWVsjOXHNn#a;Rkr3}$<B#FdV>yAr5@qZEMpiU)^<wIQd|C4ZyZl0b|cYT)S4PGSOM
zQ%C|g*JRY%G%wX-Kn^u<z)c9){ySxx{%xO!L!br@JV^++Cr=j9a+<)R+z7h#js3sC
zFHf*lPk5QgGE8I{ChCzf!fiRmN>c)HIDynL7G9+2Dvy|;<>9@`h>`oc%DI20B6t81
X2_FcC+eza9015yANkvXXu0mjfwr_a4

delta 553
zcmV+^0@nSZ0=EQ^8Gi!+001a04^sdD0WwfbR7Hrw<^KHq{{H^CJWHw)B&N~p!&zqf
z{Qdj<{p|Jnjl|}v)9koAO4jQ3`ttLP#OD0>__EjTn9At<{r>y&^!57u_xk<O=k<!i
z<^1;djKt;j`TUE+<&MSX`uzU=`ueHT?5Wf2>GS&O^!n=b`hTw>GOr>t?)Lky*6pw)
zG_WK!&*${9B{iJP>7C5!xjRah$>^8K=$p*x`1}3R==Ii)my^fm*z5M$?DzZh^{CS9
zo6G6im!I00p#1sy#9L>@UTT!c=f+`ek;mt*9xuXIW2@Bc`t$Vc_4}^Y?fdoiuOKnq
zpr_sK_vE#@&VT0g`S9`i{Qdgy@r}ji+U)k)?DwtJ?Z;(s%jEOS<@Edf{`>v@&E@p`
z_xI(tyXCgL=DWb>yus+d#QppG=)lG3!N#c(ZZ-e_0KiE^K~#8NRn60m1W^zM;5ur1
zY}?k_w$1l{h3z@n&Sbu;%3lI5+MT9nVelmE8#x%1$A4u7xOQK{=;8`t@nw_uLr;@4
zLDPiKNU}Dcv8AKIF?Cf}UXynK$|-&;P_FoaM{#JDzIW-r4U~64?HMgEApRJ0gMG3H
z0t^}lsr99m>s$Q3L%GWD{3smyBCGsu{lt1!0YC|f*3T9p_g`z`Llj)Yb00>AAK}Z#
rZQ#s|o+6C}a{8VLo^XdTC(g@1B~ch%4|Wt`00000NkvXXu0mjfPcmK?

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/bug.png b/plugins/tasks/tasks-core/src/icons/pivotal/bug.png
index fb5bdeb8edcc316ae138676ed81be275fab5463a..412b67006dc2277271510330c077e7e6293fc752 100644
GIT binary patch
literal 471
zcmV;|0Vw{7P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004=Nkl<Zc-mw5
z|NlP&B^XRZMn;1086ZxBvSEA}I}OIiX8^h(Gm*tJGcy^`F^T~ofm4y*?q_5C*PTlU
zdU`$~=r<6*J{KQ&Wp_;A>C=%usdx=I8|ydma(ejxn*|B~@06zgUs90q|89BO|J%jM
z|F307&p4kDC=Sw;oSeKVBO~K4h=v<*HrglhT2|Emd*$i>AJyglf6|cuAE+2i->=A6
z3S_$j@oNwb(v0DPOUWTe?*VNEX<A;A^Z!YG9vDBY&ia2NC)Nxoei$SNr7^v5ATIFx
z$?TZ_r}E-a@UirW{}<u|xPXd(Kn?he)dgo#!@gcAO#FYf2o;~pi1>dd(hFq3PrL?P
zPY*wEzc>l(g(Z1u{~wejgYivZxSR=dw<YL>%khB$cXMO^-v`D341+Y>%8dMfF2ZwD
zR%V6=-arIJ<BjCd*1Op;|L*0){s-a3S;_zJWJdkJ9P9u8q@UC5!|qn{IHM7kkXoX{
zHl9lf+j%EF^2wcy$lpNv_4UNyE9=62-yQR^#h;J}C1n_!HkpYM3;?ugEbk@Od%FMt
N002ovPDHLkV1jOE;rIXm

literal 735
zcmV<50wDc~P)<h;3K|Lk000e1NJLTq000gE000gM0{{R3D3;yh0005JP)t-s00030
z|Nj6003{_QVPRna002ozNnKuEK|@0T000&p9YaGxSXfzCS65F@PYetUHa0deFfc+w
zLQ+#xHbO&dYG}rnkehmTcXxPAO-&aU7ez%yQc+O=003iZY=CrfT3cHH0086T<32w>
zT4Q65adBE&TL1t6dtF^lO-xfXINxJyM@>qjK};SgDPv+`ZEkNI92`npS&4IVF+)W=
zJ31U396BB&vN1uBVr3^eH(Xv`N-8a}E<T4sNLOEAdx3yCH#a0CCWSRYTVP>VH97zQ
z06IWFPfbq4lZ^kgr~9OuzL}7bfP3(;q|A?rZES0EZEN&YVBm3et$26km5=jydGvO6
z^sb`quA}Lvox_ia!j+DAUt*D8W9w#a|9yb-XKe3XW8aL4{HC4kotA-dZ{Vq);+T=w
zo|WUVq={Kx<x5)bNmuSmR_SzhgmQ7rgMjach5yI5|H--k!L!AdkZ^Esl7D;iCOqji
zM)go#{AO?1YH#Clb<CTT!=#?shlb;okNU5q<}ygKP+Ol|V%Sex|G=^S$F=0Rso=4t
zl!1I&TwQZrV33iJet&;eSzE$$bX#R)Z}T5`0000<bW%=J000dq#1V^FE)zsv$;qlG
zR!l8YJjmnr`KMB+D-W60+!X+RimK2EuXAGgW$Q`KivZd6T{a6k_wQGKPwlFnEfzb>
z_>crQD@g?2e*gdgiAh93R0tgf!7WMy004l|?>S`1f@rph2!ds02n+rMgC{VUy@MxM
zwR;EK94rijK`g=$40;g}^gUHo4g5+~)yBY&R6_u?3+`5@GuXp;G};;3zQ;ZnY{BE#
zpF`Jdf``u>xitsAKXQBkV7<-_fLGp)PXNz&GjRr%yhu}*c*08R+|?Ww=^yh;8EEcA
R_{RVM002ovPDHLkV1mqwI9mV!

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/bug@2x.png b/plugins/tasks/tasks-core/src/icons/pivotal/bug@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fc69150f98f346cc4804b7f42abab03fc625254
GIT binary patch
literal 1210
zcmV;r1V#IaP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000DmNkl<Zc-qC6
zTTC2P7{{?Ou`Pxgjm9*w55D!m#I#98(o_=!mMxSmGJ9cRx3DbC?5$iYwYFShtM)}>
zVjAj|U}|DCYE5drV!@@$E;nf@%U%H4wWOLD(+3R?&FB9tXK~ofE=w2EhhNT|Z)VQ_
ze=alUd|5=4buU@Ds1Ss;cmVW+{4}0j#d-|%fD!OBcpW^M(AWpyJMgfA&?De;{yrn`
zZVc?@0vEs~FboVbk>_~hZzvde3w+4m9RjwyF_4If3-0ChE#Olg+bMhQX>ficrXZ2+
zT&zbHE99~Lve+5$+GZHY(hGw3grEt2D->Vw2t@;fg6eO#P;|$$%pw?mUnp5PE@(z2
zp*%bOo+L>rS<?U-&IV0awW^z5gPKOFN@>hgMq@_~(|Aq!GPq{35o0NN^=cZ>7T>}<
zRT&#VBTo%$Rnxx8l9<T#20i&*CJMG#D15A*X4}OW?3%^cy=x6R8aE#%pWz@43q_Y@
zV%xx3;0HH3V@VBogu)`PzWCp9vxcT@Mhdpp(cB3eEu3;uq^pto+MMLFN%ZkC7e%|9
zV=;Db?qwS@^T~C|@XToSp{+6luX53Ez$6F(jiLe1iv_!VdiCu|O9cg*YG@w9k&dJE
zdw0_cc8H6T6f+@@N4pxk5zhr7&a>PA>v>OFQ{dI9+>><`6l%55!bt~3JJHLoqpRp^
zb&wO{tc=GZovvWJUD^TBMP`n}t{>#R-@T>*Penn&1m-)~Ttf@5I3Qq;^^%p*4p&O%
z+r>7B*<|8z%xNz|pF!O_Z8y^VagieEy<Pf$s98N3zhRmJF4I0ddr85-#k37v)~XlW
z^*Zu8P2_c%>72ce9B71<te%XkQYBrh6CQ<FM8QA=VlA@OpWHxyW$BU!jd>lWbunbs
z(L{CGeGpqxFtC*N2n3pIZ%5do>uy{Z;g{-Z)S%vyv4K#V)gSF}F0XvBY7z3765%!r
zjc8SmK`g3ZAe#0R_(lD@b1k(rk57;xUxe|P5;L|+@(G3eGhT#KmWtePqnYOL88UjE
zR&t^dR>osW_$56v(3SCL$bLj2d)3!-jYlXIy$&n6m@$;B9uN&Qs#7h#Z4@3?_z~ss
zp?@eX1AeP^XV_VNYZjYJGFGNW5@YoszMKhT3Aqm*=#xY-5BFv{d0cD;oJ@N+42p(5
zvySRN0V(m3&4Q^BV<oGHv0>f7*6h{f(_mrV_g7xX%?H^su{ZfB`~s%=W>l7PI}VEa
zU17U%08lyv@B{l5Tes)X^E6nLM^_4ReKG^v!D%p+)^;2xVAb6p77gYZu`(FOFsCAf
zbud#WU@A)g87VI~Go(JSE#nhW96=D=r;OT}VXM9uLj5-y41f6>40mwN_ydf6QLB%h
zH|Z|IM9xN^3AX}o!iiVlhtgfL7(0-Pn{g<uO*oeC00TUhlW;75ZzBxs0bhZ0;4_|J
zXk?8wq)1FogLioL^b@GhBsF6>U?+GYLF7yDLz2{tP1jjjYPN4f@&XwwEBbNMlGA&|
Ye|zs)5^k8ChyVZp07*qoM6N<$f;3PqtN;K2

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/bug@2x_dark.png b/plugins/tasks/tasks-core/src/icons/pivotal/bug@2x_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d02836719e9a80e4fc2c18852f6cf061f5eb6fd
GIT binary patch
literal 1290
zcmV+l1@-!gP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000EhNkl<Zc-qC6
zdrVtZ9LFz9H0qSZM@)RgKm1Ss5nTq`B2%#x=zu|?w53p3DYUmQUX$Ul0&|i%A8}FB
zK&BHRj+v-4iw+-)3=5?#&@mvCJ}9G|Bk?bzi!L$#{GGc~cGui?g<{s^lXK4Ro}S<L
zp7T5BcP;|}%<W{YVzb$9#ofry$jeFey@~Y*=tU-x5#%WHWXxb6BR?V!2snBe`HKFZ
zuxld%o<qJzK1Y5+oQRC)<OMqTTLJ>!Lr&2Dl9@7WL;y1(%Uc86YU*$sZKok$P}`%t
zei_JdT2E;SVg=koo%Qi-VrqMyXFGx%+H?Vg-j6<X4s~_-N7bc6*tU-=_WbUU7yOHL
z!YblAYu1KOc3USuJ97BG^#*1l0b7yQ33<U4mr??gRYfqZ-V4*UrQq2oy$;r=)g|0B
zmqG##Wg!uyPEA0$m^jaHR^%_ZD+|$y6y|ga@LJU1Z>@u1TLUb$>p6l48aNwyHj90T
zAh&W4IAwW1#BASp5g+m^Wjc|7e3!i7FHcPg%(Io8gU~?(tXRzu?rMa={bp!1urT<F
z86t<8IU9KvI>>^*MKds`S7uIC7vI4X@HTaN2Dw0m$OHvUl;u9{R!IK5SXU0d=6$f-
zVSoraxQvdXn9w=PvYZIMJ<{FOg=1tR%am*?z-znyOS}XQsVL1Q&mX_2l|caCdgV0}
zL^>^;06v5JO<*B2fMwJc?zH$%d~oc39QX<XlvO01zWr0T7EqQe_SBSuzgYv9I!rLo
zYUJLMl;PJc2?@39TX0Yl&v}&Eq=V3{l=LqcRj~Z39>P`=nAjUrP1^Cegv;c!s55cU
z?*s&#Nm{^gg(NiAAP1LO4K7O!*o;~*qX1Hpc03#ysIywxLpW$eKmf6|@uEMzfOC~a
zSIJ;5Q}w#AYb(H0T}+PXYXSnUB|QTe^?!#uacgxqu8Uw>JxnPiTT&L_Z`B4?tR&#f
z95)A{IWB=#4Y*}_Bo$v45D-QzNiBi5LEgJe_I`_oV=V}gs7;7Py%OAIVv?r66%g=E
z(laoxDa%^IBQ?}i%h7MD2ManUWz;5wS0_gSxrcF3RzQGyUAe$-RGnUGtbs)Io3z}l
zkdm|)^$M7($p7ujCN_2%Nc~<q^$#W`z*{GKBxtOPEMauV<HpkHxwc=Ygc)Taj7fG6
z^&NYE2R-Wv+j&QE2hVw0!ffc%$)5=tRjUXH@u@+BOQYvX(hlI(oyRQbEXjdU@lN}Q
zD60VB-x=Sbv*17iNC;8H6);y-%=jDRj|JJva|k4Z56^-bOv4jJFTyY4U2tBM<&H_m
zZz3MvZt%nv;M|+T%%X@zt!zs`r>OO@s-*x%dLsPfzJM8YrmFZ4w^Y<QF4=w8hA$+e
zxjPwr6Xt?K!YtHEiOqiMXwSk-qoxl94SNl$RpcM6UqvE_d;EYoGThnz^<rK5)|Bsr
zBRQGOdC?ALtROo&eJ+yBy_#~yr<D<#ie5^ez@=h*^%ca{L$={;RZ;4f(in8qSq5#B
zoIgr!>AZf=BA;x=m(g~5qS<IFwIjv6!SvL5kANd$>q7=;#OpR9;5c<~7O^6a$2d7n
zznszq1l)<d!TU7Zwi!#nhh)5A<fZ@R<Mej%A3Y?Dr^-r^A^-pY07*qoM6N<$f_%|h
AxBvhE

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/bug_dark.png b/plugins/tasks/tasks-core/src/icons/pivotal/bug_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..5926f1dd2b1b83277d355abfc3dfbec6e2368bf7
GIT binary patch
literal 470
zcmV;{0V)28P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004<Nkl<Zc-mw5
z|NlP&B^XRhpFSOg&j4{6lnvv<*l936J_FDVnTf+NI7TrbGc%LnRHV22*%<$I=MsXR
zo=*t+4aBd{#RpzFnih5XbfixzUIWg?`c1r?9{&GkLBjt#rK$gy6lDCrTb}m+c5(9m
zYuV8=&L;$lgVZ%PHg1|YapGSP4L9Iyv`^%<tf>F@%G3Wps>}WVq#^%5&_!VSenrMo
zphkBfehs2QnlW5(DLLfmJ)o^1P0LGi{y(YD1LKF)S^sb3#F_yW9|q$8P#V(<2jT+1
zpUjT=e=08?1s_X~_<tcjfD5Sj2h@PiSY2=?HSFt^!o>eqi%{{ojEMhdBE3Kc{KRX(
z_4M!q_luLjURaWs_WwaiG8o?khRc~ScUyv9xEvoCa5p#h|9xN#z%a<LTbYsn&qa7{
znlWvf2i`ygac(4sw%*N-`FAfT_CE+O&Px7&Co}5*<yim!C;gmeA9lBr#~F>VgtWG$
ze&dy_n4NdhBcI&Oi2MztUtdoQzOp|f?%gpjTl@)$*rZIG%tQ$W0M`L**dpk#^8f$<
M07*qoM6N<$f-kG!X#fBK

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/chore.png b/plugins/tasks/tasks-core/src/icons/pivotal/chore.png
index bfe2e63909e14b0ebf860c4b43c7b5d2d27bcbd7..7479b84eb0dfb155e9a206ed2d05af374baaeca4 100644
GIT binary patch
literal 232
zcmV<E02lv>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00025Nkl<Zc-pO#
z!3~2j3`H|b@0?n?3Z=)=9RfRKxv~Nbzy!Dk{YYQPX{x4&hY<O^*u*#yaV6}R5Q0Ue
z2&k-#C3q<H2f+myQ?M<p%A)kjiv-)f$J!btN5K^V$*{yKtrq+j0&lf&0$ld2v|v88
zv*%f0?bJ|Zjg`p>?j&e)f-@K?Fex`M(ep9p|N0Rfj;81spEO8=F-QXqQkR;84g-}M
i<vPBc68!cvmGB0=?O;7cspm8R0000<MNUMnLSTYH!d=e*

literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000gE000gM1ONa4wL#@t0004JNkl<Zc-l>n
z-7AA}6vt1Yc1OzPE|skb7iv$DEH%-*Olm7__L$d+G(;>+Ay(#fmNxP-;d%0UVM#0P
zV)+N$Q;J%`T3%*fzX!?p+?><rd-`?`(Vuhz4<0&^wW&m4^{oPH$pWRAwj6N4?5C`<
z{e1oxsv9hcerVUtryh8~U+Tld;1g=oH!N(kz0Y9=({Cp@h8s(mM{``MV^FD*D~k3<
zKaX*W4FnKkhQ36uORi9=s5aL0+#g+Ja3oS}sNp>~A<TXZJhZ&j#i$wM@FNJ{GpVJJ
z$_{~TZ(<6qAR~G(`6^=V4~p1JPTcoKjZefi=G9kSd2t3;q|~72S8u{_CpnQ+nH=+K
zEW?lMIDmj{?BI}90M1x>yL5_7do+Xv*lz9DL6&X5>y9sD5Sm>|lVZ}VFU<GEb@^7{
zMW;`0uzXgWQ~K}wC_|P*WD>{VgjpcU<|G87|BtuA3Z3vXN$?9p1Hd|tbxXAX0000<
KMNUMnLSTXsLcON|

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/chore@2x.png b/plugins/tasks/tasks-core/src/icons/pivotal/chore@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4406c39f0a6980ce299aad58f856cdd0e7ca611
GIT binary patch
literal 303
zcmV+~0nq-5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002?Nkl<Zc-rlk
zQ4WJ342F5w9^ARyjsO=h9zpO9cu04Ly_vC^bjd~_!Ip_;KKw70wx6~@70x+PQsMyE
z9DubpRnAkA-!1_(ND=^MpN<P)F!%&gXgh)G06>k;1g@RXuBiapOE3o<Kw}{JTO+QS
zJbOn0P=P=ceSW>gCE!AQC8svwzyKJyO?U>~82}^3AOqBqzz<Lhx}aLLxybHV1d#G(
zO`udwif=A}DgaQe1@J5l@beNBZ^BJ&L+(Ljxd)NVa1=`_K+elZQUFZG>sV7u&_@Q6
zYasb8GLRT<6B_?YO&rOTKMn16C|wue_%r%DfER78Ck=D1GBW@G002ovPDHLkV1j-%
Bbk6_)

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/feature.png b/plugins/tasks/tasks-core/src/icons/pivotal/feature.png
index a68335907b15bda97f70f825c45a2ae0324a6e05..26793add948f8012355c3de8d6c9f6466a9b85ef 100644
GIT binary patch
literal 472
zcmV;}0Vn>6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004>Nkl<Zc-mw5
z|NlP&B^XTXZMVaUmzD*Y0kJtQd4dLPuXo=C!ekk+qB2P2T#xx55C*YHHegGGPs^Pd
zdjCNf#KvpD;vzq{CB;6@3k&^>fLLj1slVuvPKP)5<{113VIcc0NDL$gQUg*8)Z-2}
zV0pQ3!r?~q|EHS_{-0<x`hT*`^#9c<CjalwgJ2LFBnFZLsW}2vyS&0T55)_+I((O1
zoNW33@)WcGSEic(zcJI||E;-}U<_h|#6WT&HM=_f_OGt;WkfMxQ?nn}(MdkHugtXl
ze{~jid<BS)P4@k;rPW^=YaniG_0>8t+5P*)=??#~;geI`|L^SZi@+NT`@39koSy9T
z|I8Fje5lv$|C(wKNt^~OE^rpz-Rk`B_ypJg$0uUq{hcoVmzTKu;xu4sp+oe}R_FhR
z`rLrn{r|x}4=@I?5BIzM-`(!=e?^I76HWt`mpIPa(dzntU$^_`-5qWqwh0g$1KBe{
zVmsU1{;w)`+KkhHm8JG;wlp}VZ>n?TMNf4=F`liBPHC&l?J*6Y1OotV+&IC)txOdF
O0000<MNUMnLSTYdwCR5U

literal 382
zcmV-^0fGLBP)<h;3K|Lk000e1NJLTq000gE000gM0{{R3D3;yh0001%P)t-s00030
z|NpU>HM5&JtCBLbmnqk@FWk5@t(7ylnkcZBG_jgFzN9+1o;26DJK(=Nw3;>2urA`f
zG{UAi;lDc8wKc@5KFqK^#HcsRt~t@OJJYc;*0V9%yFJ>yL)*MS<H0`VzcuE;H|EAg
z=fgVZ#Xsl9LFvXk>Bc_l$UyALLF~&#?aD#!%tPtLI_k$f=)*Vb$UaKRQQ80i02p*q
zPE!B?5D-8>KtNz%fPjFYprEk8z|hd(@bJP!5#Im+0DnnDK~xAG1;J5H#2^#^z<EGf
z2vO7f-)?`6F;N@cO)1U<FdPU4<l%2Z0==~k5~Q(hBS9%8)!dqMpU>+oeMID2a=T_<
zM}DT4)^dni;_D}Stk+(0E@i%d%RFp(t@Zoy846-9%s@fC60VBE7VCZ(Z?T=w_X>6I
c5fK33A9L~~(ITs7F#rGn07*qoM6N<$f(BZ!+5i9m

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/feature@2x.png b/plugins/tasks/tasks-core/src/icons/pivotal/feature@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..66f44bd2ad51c9c5cc0ed478e39205cfa1d8091f
GIT binary patch
literal 965
zcmV;$13LVPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000AwNkl<Zc-rNc
zTS!xJ9LJ>~D2NIy5PB-;p_}(4%6Yc4i>YgKGpM&7L)2<h%PzXmQg_j*Tjo;dTuTG3
z$m`4<&)Q708)!*cWN6T9FFr)zum5jW<do_hZ3aDj;J4r9`}@K<|HJ-a01&p4g#9xH
zJf#B8G;39Hgm^x)%VNNlo9-YquZRIxo+{j3DEZt+aOJDQLvG+!fjW286bA^#AvNIC
zDpz&s(xxZtb^}7<510#?ft&fNl*h({Fx9jt0LCPj8Zraz=aue>tC2A6oCD+b3rcrL
z3^=ulZR{1{?7RBCFzt#AfU%e4NNxLHH_&ocX&5ud!lXS4rkrzNj5(|=)xcVJ3ANFw
zNeOSvN!t{})}~YP9o;(Fr-|BVm~_O#`{p??#vInL2YZ9(Q4_Us$D#%rvs3DtvJU~H
zi2}cN7x=V$z^mB{1LU_y69awPIPerCz%xTUyseK3Ed3eGVGVl%y<`SwQ3JJ56SZ*%
z+2vSZz^P4J({e`s;P$y>7%Gg0M@3Qd7|}(+)6!^oX^De34a9_fKA6KA_F!-DJZhpg
z*)dLbty}aF^pvJ=_L$VuLuMJgsEMDCg)Fe{gV(lwWLd(ZU=4e)H+UX3iS|ryS^Caj
zzJ$J-jF_QoM`lKCG`y<czbv2@(FDIG<M<z)0-r^FY^YW}J7!CQaod3<ff_^${8qJt
z(=qg0()Gi&hheNvKuF|?08nGlsv2i1l<PPd=r<}>6BFGdS5sj0nt&HLOEhNKO2tlo
zA0nfCgRfdK@x&^I=T?dnIODHTfY*HZ_>#Vaj7eVn*h0foi;xpI<2B2n_eyHSk__~e
zBo7Z)iD0CL<_u#v1a0SKa^42)S)%n_Mf8`!3L1v1#hhWvrO=Wq(eXEsEllgt3BhNg
z;h|Z~8K#Ve);#(iZv!_@QdRB}5%?-3;HwNq3f_w302nW<OJG1RhPDFHN8ScnbE&bu
z%VO}Fq(5LyG8ix=BP@aX2F8Kf&%KOZ0(UOZ(2$uF!P&s|6M`*mXN9x(OC`V>r7&QW
zeTQWXGHStTAvvsl?+eTrq|i}BgFP!r&e=diX5!Ji7lqJYPM)Pfg0LRFg!=8D4bp?X
z-)5lm5)F<VfsV5QM|PsEle~bQaxqJwIA1=<45JsbJ;fq$ofdR(HsI0-?A^s8iqEZQ
n{&$3?TJw@xerw>ry&ZoADfin;vt5vr00000NkvXXu0mjfi!{wB

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/release.png b/plugins/tasks/tasks-core/src/icons/pivotal/release.png
index 10e71b0a54a3ea865533086710560188291284cf..fd41786c4d44e4d38840ca5274f4988871d2e256 100644
GIT binary patch
literal 501
zcmV<R0Sf+!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005JNkl<Zc-p0t
z&r1SP5P&T@bO~=khrkY<`x80@-Bb|8L{L#u6C?;p6onO(PC-a^@mGQ_9y8SSl0;It
zARU6B$OQ|e0uNe&mui~#utVEsk%w=YH|%_G_Ptpd0LVsxK9owOm~&)GBL9V-1PfZN
z_L61Ut3)E<{EvW%L?R~!g8?uGx7*zf27_A|PySVKk<DfwNU>V2hE}Tul}ZKdcKegd
z<zg|f7$%t4Xf!vCMgu$^4|u&^==FNg?RLRrGSQBlPG`?-HXmWUC?(ho1OgROM8Hm<
zSS&)lUZ=$>l?ntwfOflmi|dk<faf^wtkdbxT`d+1Elj0Skk98K91eeWl)?PISTKtS
z(P;FA9AG>i2dmXe1<huY7N*l_U>F8Mp%6KXHL+kF*~Tk;Bt^Mgj&@Nf6rfhC(b(Z|
zP$BY$%!mcY$O`gIUgCK^gS)<x_Q~4s_d_fe1D#GsiciJ2Fpb<H<A{9FO&Mok$7Zwj
zi6EIw($A<?t0i1-hy|<2u4o>{kYzmiL*%_&F87JR=kpz4eoidlkfkAGt1udkdpH~S
rdcD3RHAvUU#BV>(V4UUO1f%c)j#>(mvNOP?00000NkvXXu0mjf4yxG)

literal 514
zcmV+d0{#7oP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0005WNkl<Zc-oDU
zziS#{9L5jz?z}sH3mP>bN=ZX%kl^4Dp_rv$kS<O-IZC_P4l$!H9n2asw$&j&)=;6~
z7BCt57i4kMl1v7K(E9XwU*eHaTJpdL?(Th`@ArA%?<vY71%tt3%d+5fI=}Gs9oZm`
z$9n)sY{ld8fXn6jo=hguY&KD?R>5y`F6|TRpGInj+%y^uEHxYsQ79C|t~0W^G*T~Y
zm!@eS7!kEv4WrQr^Z8tw2ZI3|4u{x1AqV6Wxss-II_>27j&xl|I2=YIkwCdz#&|r&
zLAMLTG?B~Yu>Nulx~_>Lm(u9>`_o>p_lIE^2!%r6vsgs2SVTUbM<5WuE(^UbY{N24
zu~w7DNF=i3@pyhSE~3#WQmGW&Za0_&U3ToW+o;#;*ve+1sp_45M#gK<C@S5ksyg-g
ze6nMyRFdahEEbqfCTO)<qTsm*shFneXS{Db<CGtYBuh@ny%@=CHnVTJ&CVRzo}4YC
ztupG2d{&<7Jv(1lDi!qmee`-gWHK3%<gFYDyS<6UVxaM(^0!`*4*5z>AI7mFjl8i#
zcD?1zmX-fYee&n9(@%22A%~S`$TqUuFGf94o~fnr58JKNqb9?ynE(I)07*qoM6N<$
Ef))Yt5C8xG

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/release@2x.png b/plugins/tasks/tasks-core/src/icons/pivotal/release@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2365649df2a4437b7c334d3b8451e98ea04d1bd7
GIT binary patch
literal 1069
zcmV+|1k(G7P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000B@Nkl<Zc-qBR
zTS!z<6s;gDh$09oilTm^qCR>;e^EaLz8_#d5??b`NIvjU(1)54gW;o86ki{Lkb~ui
zL5$&GlZu$BDfwe6K1<UP$}n}e_T|jw&b{W`%$k8UbM8Lp?!C_5`|Pu40}*X-C!{Y=
zPftC#20Q__>Ri7n)<U2eAmF$=2<!!xyuH1L>~^~m@c7>Z47~f4loU%-Qxm18rp}j@
zl|5~3ZQc662)tqf&CSj4O(qk0d3kXtC?X=_XJ%%mIXO9b-@hcV3s`{rC#R;SmV$$W
zN#ueIKR>_a`1p8RXlUq#e?cIEjU*){S#36(#&~sgHJQz3G8&E2b9i|8KtMpi4UD&}
z7l9Y7*kZAC<mKf#8Rt+84Gj^JQbJ2h3#F&0OLPAI{&rtq--j3<_!|P-fq593#%BR8
zb|Qe-%f=ljEiIMFiC;cFbr@d)HvTDrAXX9=7x$W#x3#rVR#q1I`1nZ5YiepV1Y%-h
zoJb;33Hk9ukm<wkO<<c|0yX?1V*E;Jgxy|IQ9(UDJx<1ZdwVrGQeIvz&2@EkQFeCr
zSIE8tjd}=h63sD?{bTB#vT?+ja&mI0ySrPGRaRDN2sq{h8X&vMB=ivQVg(@~AurX&
z8SDY2p~S>QDk&);oB&xC6&0m^F9q@kdOc9VN{Wk%OGidVGz5?rP6RmiEFT{qmvV!j
z@vi#4^H|#t+;&A^Gce7r8XX<2H5d$(kdQzP4Gn~FP=9~F#?`!grLo!BSt=?jB9v=~
zY!2QziM7kXepdvp2*uA4>tUrKghV=OoZU)!XJ@Aqf#Km{`6#lts;a6!VEhPptLGRN
z3dP~Mxw&2H-Ev0H%*;?@V<V-drAcIX$4UZqb#)pq2_(BBun8FB`Y-N*cS;43k&&8w
zU}LqlwKOp?A<G;UaRnT4Mc|@X$T#3&wSvOJ!X-5UT+h;6U|=BS=jT&<d%Ik$ROr-G
z2_K8a+yh(}Nh2%4bsPqxHivOOAt<$^S|i;H85tSsx%+wueB$m0*dv~gi(YU}C@Dh$
zIt}9nV5YvlUb9oH)hc^uU|@h7nHDj3!WDrtVxe_~#M}Yg0{X<7H?gs?M%4K+rSYJk
zAnB+oLxdt_!rVtaw_%o0bZ3?Ofp4_SfEid+?;iDDouqag$Je3)x+KsiVtz<xXLC>}
z{_G%t^S-DgFgQ495k$|rB5+J7X<tK=$ro2B(8fBVqocp^(VU!|q=JHiXOImldx75(
zxF-nQ{mYj7EL>iR>|a1WETdoi0+~rqN7Nw*99@q;9>DIfu&_*!DZ+TCD*_&(^7X8f
n@ileD=YUggA>j6Z$L_>0>jAX}vTe?000000NkvXXu0mjfo&@9Q

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/release@2x_dark.png b/plugins/tasks/tasks-core/src/icons/pivotal/release@2x_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..f14f527c048b98d41f881bbb8d7b9178320a1610
GIT binary patch
literal 1132
zcmV-y1e5!TP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000CtNkl<Zc-qBR
zZ7`Hk6joD{rfJ61OpTd-l&|ok$xtcuF=0jcQ<hb}n`&B;CVwK<vNBUc9}F`YWU!>L
zBcw)J-=Bk`k!1VAU?fT^Z09t0o7-#0`(n$FXZPKE?|Yu-+<VTsXSI|{rPgxd_eWDx
z6Bn!itm3$q6^juN1sDWuSuO!@05gEi%OSuVpe!sb>_6)4d;p#|{ci!$DBx0P=(`Ic
zA#dyJ>!-`h%OAp+<^K}U)!5jm+-GIgk(HJ88O5kjRaMmm-@X9te<i>Ki3$n|CU%;c
zwKX&}%+dm2C%(gu%mBvVcN}1wrUhI^qOh>A59fr!KAIeH(#xyIV%M(rD-jVND=RC%
zkU*6IcqDa~ET9>Q4jwx6A}uX#j3%$HuAbg*Y}~R<Pp=taXk^qPkw^xpHLn1{0G-7O
z*ouaVi;KVM8yGZ~l$1=-0#Z^^Mpfi0Bqb${Fn0-nJCh99u}}daXdqG~>PO=ShK4OZ
zzP_&^5XUhn{rvrVX>!~Fxm-R?ljr2*jEh8~n%df01sQt=*v&}*kksN!JO_s^rl&ZD
zDQRqC(yAJB_wabd^gihPc?Hht>FYQ92LwEXIH`y6_gn<%VnCIZl}$0p5uPVb^dJEk
z{23DyGhk(H-H~wP#xP9|4$PWcShUgaoj!A>2Ihvj2sn#IVq;?m)d{$H>(*ankcP7Y
zPtTq^si~ik7{{bi={WPf{QUenn9JZI;4vC;admx(XKig`^IT;FV*x#<1!QMu{~@#7
zySGCu77qx8LIpEMKpYk_S2h6~06!`!D!yZyVPIj<rDtS}2?T;3H$H#PS%+M__>SqV
zOeUL*kB=X+wX^HQ-`+kxa#%Y7Sj#5B2aR64etn4V?mmYsJUsm4)wsApRm7vXJ(ia3
zH2D!n$1Y|zKpJ<$^F1zUh?Puv+|8{!At7Oi5m-vBd`MzqYT6nU6r{MFm^i}pK1wX^
zS5prVd^Q2=0a$Q`q4w{Cv!0|4NON;1m}JqA1$lXS69K1Ay}@(FF)Utc$ft<?c?Iyv
z;#7bQ(+FP4OaZX9f5;$ie&D@<-)aQNxKzSive*e=4QQv09JaN6N|W2!+jlaFA|oUF
zaVMbg^kOPfbG~c>v`Lg=s;r^LaVMmh8F(~zGc${9_V2Go0TFNuG6mT4c%8IJVPGIu
zKTO+=Yyw<}k(_y|V*~&LY`UnZs0}LRUolczS~{n4rl+Tu!Q2xrw_zGFbd2SSUJY;q
z$eG?t)Kt#8y1G76S?3jiMn?hY(Ygh+S9ryyKze>f0Z@uZRfPxP=;ZW>G%31l0_=zv
z4;I;IV$%^!y!~Bx{QUfS$@bT9X-JZZfRjsXxv>r7LH&5Dx|9IkYy$A50TSgpn)>@i
y8q|YadO|$^7l8X3Bwuh>yi${YJ{KflIq?fa@imZDq#Q2*0000<MNUMnLSTaG+y<!t

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/release_dark.png b/plugins/tasks/tasks-core/src/icons/pivotal/release_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9e040fafe8b19cb9cd6ed06d71ff2f824ca61e9
GIT binary patch
literal 520
zcmV+j0{8uiP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005cNkl<Zc-mw5
z|NlP&B^XScK7AS;p95lEEaE5_mjU|6jvc#PQBiTArKKg790M9=&YZdR(4j-Wf$aYq
zHf(slXwjm2Ae)0&11?onRh<WEK6UEUKXVI<i>Ya8_qJ}``g+r*O$&hH3iu3AJ%0T7
zEkA$%>nm5T{Jd=W@=uCNN@tXmmCx+iv*#Dc&@EfGyacj$0@?Q13@BT;aN#<TCJ?Tw
zu6~l0m32QjB;+R4MgOg=tuGlG8Epshw_-EkWLkRq8Vya&b0AxH@810rq_Lr~@mX1U
z`Qur$X1#;Ds1Yc>0NnstAimq%+xy_)!Gph>o135S+`01y$N(E#+sh!04Gj&?=FOY;
ze$L#vbAaNR=mz8iaqrQiN1uZ<RaRC$QC3kolarhKAR;pI7RW_F|9=O`0r6iTmP9w;
z01!t2@n?{tprD`*pslAs&Ij?AELrlgtE=nfkt0Vyfq4`?7Q}$~5fC#0F+bEb+kk1H
zYsZcqA3z2)H8nj0c_S`99_0KYbOTa>cnVs2U<6_}V90L*rH71+jO!o+mMmSm94M}c
zZU87+obe=Eg?;<>O<A>S)g538-Ha_Ef#R8kQ09RqXMPL=D8T?r?wnmeT`xoc0000<
KMNUMnLSTZ159!nZ

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/pivotal@2x.png b/plugins/tasks/tasks-core/src/icons/pivotal@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1afcaa3bcdbe94e24f1c91b3672597c62884fcb
GIT binary patch
literal 518
zcmV+h0{Q)kP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005aNkl<Zc-rMx
z%}T>S5bo26sGxTd3yO+wpr~)4FCZwW2SvfZr?B2s^zKE`n=zqAduV8F1>4f3Rg1#7
zUm%dIX*NmI#?r$FVRz@7FFUh4vk4+f#EHbe5wLxor%s|f1svZN=<=yTQn602dV@+I
z-zM_x8)KNmn#cu!^gdUk>emk$4R2u0UCs~+@h#v)dN==4<d_F+VB3;_vvisCfR62e
zEjU66NHO(p&dbURX<LV+PS24tlr*8v%$sAFa}$zs*$Gbph#$Z0dhL_6^*xgN$4KrQ
zbqAZvuI`Yo*Z+j$=%(Ob0FsDzo>^LH?wCVnaoM!7bAZ#A0Q^0l?b)?m-_9*yxA@ax
zKN(F0T&Wdj%;jhAZTAQVZ0%g&77BPMI^(Bp9t3x8?E<s4bAekZAXjZTjF9bN1;EzM
z1#Y1LKKqryWM~1f<xfLr1&mAv7l6VNSqNqq99-ZQ3Xq~q!i{|gm*gi2V?TybT|}@6
zbrAum{jpue?J7omgCZ=)r;jDq(u%kuxzs6Ejt9m`8J;k+9b<gVEr2UjLvqfV38RIE
z1h`07y0|3^+mvE$WKAhA1ZP=#b7{-j80Om2miNZXsApftzZ^t-ig9u0xBvhE07*qo
IM6N<$f_!G}X#fBK

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/redmine.png b/plugins/tasks/tasks-core/src/icons/redmine.png
index 391f369cba6ed383b8b8de5354742bee1ab7d541..d07109f4cb535f43d51e6df843e793ed97a033c9 100644
GIT binary patch
delta 282
zcmV+#0p<Sv0<;2<BYyz<Nkl<Zc-qa=ze@sf9LDhjgB)CIbFrmOn!^x+P!J+VTT%=~
z#Apco1%ibCg4CaoYr8o&DcsOdkb;YYAV-5>pWefVFJ|0{v^cz$@AL3*-1p8B5$iv!
z?Hh3FNgqP!;R_C4aR|TXz^r<)hc2G*2vHAuX5+whU|K$Zfq$qZZcs#Q>3o2lKLeAy
zL>?)0&{};|&PtkHqWNoJd>h}z6yLaadtqc1?JN*91H;nU2}IT02FTJ&y=yb@UN{Zo
z3Jn~&4Uh%3lR?A`yyc>82tKjzb?@XK+I=<yb~e(3sDRf1`AB=V8R%z@ClJineR*^S
g+I6<{U)a<S9}{%IS6d=2h5!Hn07*qoM6N<$g8JiwWB>pF

delta 355
zcmV-p0i6D{0{sGzBYy!zNkl<Zc-qyGu}Z^G6ox;<TAIYo$-$uyAVnmIPaxvpBRGn5
z5a}q0IEX_h2iNK#IQRe};v$M#r&=6L)HW3nhYk)R8RCE223oN#2o7HOxaXeppFj7W
zz+bKi2G+!H8V74QM*&V*loTJB{HgLi8@(hmzRjC&F<HgV2Y(Egn>bnJW<8siCyUI_
z%@z|9guX+h{k2NM4X~GM!b>qN<4;r5UJp`?b~G1tHS^vFiwy~k!NRvEq5PHzO|9c8
zXW(2x?i!wDv{*@!?lKqd6J(@Y74Oo{Hwrf}r9(wT2AQS1%}BMmSSOBYO?IT%bggT@
z>ow$C7?Lg&k6ik2wvpV0!-5X`GP;EEe!ut}T=k5Jocdg2@Uf>W85FPgGmvJdO}|Zi
zXtC7KK$?7;{sLWNQ$fj4h$q|o1}m{%@d^KbeE}W&g~;}f2w4CC002ovPDHLkV1ntT
BqlEwf

diff --git a/plugins/tasks/tasks-core/src/icons/redmine@2x.png b/plugins/tasks/tasks-core/src/icons/redmine@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..55ae4db6476c127aae6ee3c362db5bed0c16e591
GIT binary patch
literal 639
zcmV-_0)YLAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006;Nkl<Zc-rmO
z&r1|>7{~Eh@z9|kV1X4P6(!Lj`f-U&Dhg>y$vi|51f?h=i)2#t>);;{WQT}Ku#?*{
zyLl>t4iUskMpV>7*k*_rD#7NDukVRxWte%sGuEXJb9lk*_j$e_KFh-HI>s31UviQH
zNrC^Sz|4*2<*0y*$H?O+<}ik5=)tzXDlmP$Im#OBL>db)77Mbo58MB!z|^&qHgy<9
z0c+6<V{r@XWVeWmNG+?tkE>0Z)A$7=2C)J;-&sjcW`lwA2PlgzFnQ%fPy^;*0$l9C
zH;mvl@^a=X`<^?o1tu;x`lT=gqsYqq_pU#T*Ecb*+<A%Bkp;#tHTa!EIb2M_i0;5%
zD3G&86lLGL+aXyQthW{z>pou61cO)Diw(%)wr^*N_O3W@#Ur`9N3y)kd)5Mlu5`%@
z7%_`ptVGJUv&8n<GFv5gXMK4^RH_9=FC6o1fl+kHJj7OjS=y47Q44(OtoO9T1k7Wj
z%tLGin3bcT<ULUf<TFP-eJ}wdGE+r;$yoBfss%oE9Pw1)Ec)>o27NM9MHOJ)A{lwf
z^s=kf0w3MOo_@5UMqXEAt30cs3NWw0CV8%r>;dcw6?or%s0zlXfB|fVV-r<?c}g-0
zf$TG(0`J-m*25@v!?B6`wPR;O$?ORgc-van38SclV-r_^ona;OVW_~HmIHTT6lHL1
z;tH@cq+~t~6&OBW`y3`<3Qm-`0_<d!+z+7wxpVu+VFJFxi4s?Uo%>4eO!BWdDUcK>
ZSp;PIc24EiDPjNs002ovPDHLkV1i|cBCP-b

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/savedContext.png b/plugins/tasks/tasks-core/src/icons/savedContext.png
index 84b5f8910735ad69aee47bcd57de0627e1cb2a7d..4eecb92bb1361499c5cb9c704930e37bf544c783 100644
GIT binary patch
delta 188
zcmV;t07L)&1I+=D8Gi-<001BJ|6u?C0F+5YK~#9!t&zbEfFKM-JBJfF3=?p10xq5z
z#XXFZaIAbn4I+r5hZhKZUJDR26R_5DgULgJoTC?lEtT8}r~uXn&nl80K}uaP&I{Fe
zB+yzT%sIxGBZE0WwkSxEa1<!e6!?nDkC>x64sZs^{#^$l5H+i@b1u*=_}anc4IT?x
q{4a>8Uj=e^p(Y5Fu8{r2X>SLPU1;TJAOj`<0000<MNUMnLSTY2-$?fW

delta 495
zcmV<L0TBMp0saG!8Gi!+001a04^sdD0Q^u)R7L;)|9Fk8FGFBTTXlGht5|G{FGFBT
zTXio(U|4L7FGFBNPlIcLqIr$1MN)o5P=j1xkb`mebA-$I`~6#Or{nJV`TPCs^ZQmw
z$@u#H_xk<c>iFU8_*OpX=I{F2=l9|4`Q7RF-0Aq%<MySw(|@nN*0;;$=j`<M`TgVV
z`CV|U?eqKJ>-g&O`sncb=kEIE?fK;G`J}SObbq4U==bOG`t|tz*yQ)?@%ypB*Wl~;
z^!WVN;`ZwB`kj;8oRQn~_x#e~_2=;V^Y{GF-}UD1`ttVt&D`_l?fGbX!(ef;@%8-h
z_4{{jxVWhQ@_+I9ti0BvvBcZw_uc6CM&ZTL0000GbW%=J0NMZm-QXe^INU7s)7bU&
zlV7n;0001?Nkl<ZcwTMI<qpCy0EN*p!KI!1aCdiim-l}c#=4S_@clfw$tC{eaiVD-
zMUe<ZQREc$Q1p@*OtYX5*(@J)ffIyyImvd?ydQz0>uB2Rd9({7P&F-Kr3RUME`T84
zE=iSYt=>?YE?80vIE4^&dwl?Jb`T&KjVCrtXJ42vmcNVDdIR7m4BOovKv|Xz45zaS
lpmDikh%n3}if&^B@dhBa79oD)7c>9>002ovPDHLkV1l>xB&z@b

diff --git a/plugins/tasks/tasks-core/src/icons/savedContext@2x.png b/plugins/tasks/tasks-core/src/icons/savedContext@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c03eaad1a36e38be8557ae6794a74338723408e
GIT binary patch
literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002pNkl<Zc-rmM
zOAf*y5P;!1p4VVwV&Vx%JOUfn+=Gpm;UbQZ)MQE-!16F{Sp1t>@C$7R5D{ovYpm?y
zf>_~y`Je-UMT`QxIm9TyokQ#eKw<R$TMRK0;Jb#1Q2?&<19G5)11`@OmULc#PfEE-
zDHSc;hyF&_Hvw2{H@W)-?R$MUU^!yp79q`FbDLsG9uTf?25_4vs|Juqu-agGu4s%&
z)*UcU;O{5U{VT`-VuNTk2gnd=3#e@Z4gsKv3E(ygKfACY0B!*N3SdjUgqev5#eh@=
c05)#j2hKknCN_IPivR!s07*qoM6N<$f~F5_9smFU

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/sprintly.png b/plugins/tasks/tasks-core/src/icons/sprintly.png
index 4e1fd1d746b2df0dba4678cf4f34358d8d9414ed..c95cc07e904c22dd939349de5d1c4f484944046c 100644
GIT binary patch
delta 762
zcmV<W0tNl81&0QZ8Gi-<001BJ|6u?C0?tW9K~#9!rISfa6JZ?1d-7o7NpHrRU@&Ya
z5=kJGMWaR`jl|{TO%#`lo-`T`dXmUcB*B&)<CK<Cx<sN~fL0DzAuNTqSZb}%mO?wz
z=_1{pUrRDUt{mRv%YWwm{xA972mlC<qWq)ggEFsr>A0Yxdw=wJ0YyKnl1@xD4(oQB
zMs#6epW0GD$zGO=>65u{Y9z|M{sYuY#swu}S$(BsV)M1m2!qv%HRmdv8%}&%UP8yD
z3AKIdaA601vsQWtP)Df6owDkNJ~hnqKY;CDNQbu&5BrhW<B*Am^0QUjBAP$yP)O0u
zIS&u0ct3iqQh%z7S#su}2Z=a?_+JhQ^3vPiiyhNfq{$h(f8eq&<5Ir{#T0#t2b}Go
zpT5x<_RYk|u)B!FIBbn6uu@V6Py1VJTjvl9`hkcaLsMp)7t1?%z=a;Ab>8U!QXE(|
zhzK$WELgGLau1G%i*Ubq4xjN0m_!sva`5|p<JzERoqq@1Rv4ltlOFcP?<9T%kz^d9
zEiXJ`3Qm!T0JC7TNkpSzxPPu;Zd#8ADr1ZX+*O+s3ONn4VG^nI9>^YIO2g6E1jm)D
zaJRLA2?od{i^cglsOVul(aywqK$T>Can0=lvI($J7JiEvuGUs;4)kN!<HE+{M_>Xz
zFeF_z!G9v?_d+zJb@KpHl2`9O8-YCrA-x`+E((EZ6LJ~7BZCOc7{QWrEEWb>AC#6^
zly#3uctE*WcA}<Nh2`Z1z`2AZ8FEBnE`%L23whm$r$}Nhh`{;^Zj5MAM14BL19J5|
zN6DH*LmD_;_WYI%w~JJaA@`9%Iz_UOV)===MRPuh!p_nA!h=n$B{i<whuo>_RmFP^
zGqA1Mu;ExC#aV*gX@lH63(>Ham}L*EdlUkp^Z-Ce06FE7l#1!oMP2gt%LAH)TZ5_)
s5p#V=vsBux=q9lXa+`&R|AnLI9~2hwQpyK_N&o-=07*qoM6N<$f?%Izd;kCd

delta 672
zcmV;R0$=@y2CW5<8Gix*005AYXf^-<0(414K~#9!T~gal6HyfH2k9RWeUXqrc;HPX
zk^nE77~e3#gfB2L(Rhm{Y9ipJt+l0G3bas4+eC|(iqL_X&h6aKOs7ocDz@&Sghcnl
zOy<m5XRp2X3N@R}R;$&1LV2E>U(M!LGP#wdVljVsu-`sEgMWpZCv^gK;_+~HIpqjj
zaEmj8lInaaF`fK)badE8pAz7ss%=dr!j43YnVeaS7<5N4VM$>-(vE~D>UHn51H7bU
zGt)8G!31eQphPDQs&sYP@hGJ_qk7$A;rHXm$G-s_5F(KYuSPLa88tu*lL(bdN>8``
z{0SAdUC2^q)PGzuJDUgy$TmKI%0X+2s~BsHo7&{7%B4${&dy4Aw-t|AsU-XYwbRL1
ztNABX$Y=e!04TwlWp0t(nmRmWZhYN1cODm4w6QzP7X()&x4?t-^>WBGl+n=<fWkGP
zp1DMSH@-bQr1bUChUC8B%!DxvLm3+zrNj)amrH|#1Aib9+Zv1kbK_!mv!i44!bPRG
zmu`Fme>pW>iLMRwgPEc7_tO5Ji|p;d9HjCC&v^Y(>FHraHy_?tZ{1{d#+U(qfL8%Q
zQ<X1k1sH%zL~M2Y#`Uc$mq9ddI7<Ij>I+~38eEy1OB@~U2ewARR$rJ;A8EHoXypgr
zb%jgydw+LvE-jfQxD9)R>yuN_(>+*Lb$&HX9zUQy7t|nFr_?~1IqStU?qEhue@8?k
zlY4u=0zx|)Kg(+ixy71;p*0WEVKQdPhJ;-0)I}`zmNWE!_-w2CA^K*mRDi8Zfx!5h
zi}R})IBfXdKjAy$KpDE4NvG0_Guh?&<)sBjvKg~@x9cyFzKUICXFA6K0000<MNUMn
GLSTa8(?G5O

diff --git a/plugins/tasks/tasks-core/src/icons/sprintly@2x.png b/plugins/tasks/tasks-core/src/icons/sprintly@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..abfbc600a474fb031f0d75f98d453ccd8300ef28
GIT binary patch
literal 2210
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

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/startTimer.png b/plugins/tasks/tasks-core/src/icons/startTimer.png
index d600e7979be6ec588fb7ba9a28f6e4bf3a6b6073..2d68e012c82e6961fc9647a6f5339d9883338776 100644
GIT binary patch
delta 629
zcmV-*0*d{a1cL>T8Gi-<001BJ|6u?C0!m3lK~#9!m6Km+Qc)bo4eTxGA?iJtY_+Yx
z4YoO@jmnC))>^p?&4-?X`?kHb-hB#6RA?!RI=srHX;~qG3jRaA26|N#6+yc)2E|?$
z^q{|f$E5BqYtX~z{`md-p7T5BToC|>tXAv)aEkAXju4O|G=K8dZnys=cHoovS%gJi
zA}53bV#G|-G$axUD3{AntycS%_#}?`ZwRqP<g`%0;`jTZR4R2FjRx0lw^@$ka>Np!
z!~=l<Y5tC!6OJ(JcDuoBHuv;;{eHb(|I%u;7(QyX8d#R?k~&f^6mUnQQK(cZoXKSB
zP!#ne9*>ur&3`7thvZ4!;7kq)>@o~PW@c-(8e=pXJ6f%_>vFjsqpupUf%#-Emm>lk
zX(qk>kIiNSB7iI85V8_uFc><xZA!X%t+(jXL_TFdKf$;L>mq~O`71znkW40_P$;m)
zVv*sYlF|1-=2?L$`{F+3duB?dQWVxd7Yfj!PzbWwEPt2J=NTR<#oLE4|3L?G-zrQx
z7GU18Qd)n#p%V(oabAeUV%<z8Q^7fz0jlZk2XN)14irHx$WUxzYYE0SuOAG*QmhTV
zm=W{efywLj0-kag9}bsJr&$zRo$xHf%=<@urr)VyYDWc9&s`X`DnVk9TlfMe$xC!P
zoe&HLA#NNFLnIQRE^Xb0$({R$kouMn#+|p;B}Rq#xPO7e+j)A?c>^x{mVUE+2gW@M
zp$iV>dEpuSlVRH&jCpRts9U)=;<&2e=l%#Bhr}}58*$7zhTh1|9F_kCvki!9<Q-Ht
P00000NkvXXu0mjfX22_q

delta 523
zcmV+m0`&cZ1(^hp8Gi!+001a04^sdD0P|2xR7E~ZaR2}RDRo0BbwfT&a5!^RK1*;Y
zazZ9_KR!!v5o<F)OmRL-a3pg!CvGYyZY-0UuRcp~Hf>QZY)n3VPcCmonxV8Zls7n)
zJU5#+J=Hc$e_TFGaFeaSow?Aq!O*+j@xR2-<oEyO?D6;g|9|}c|NsC0B9<gkYJhWx
zq<o5`gp8z!kf@HJxR0y9ACe&<mLxybI6&1oL3wA#%-6~8|IF|I&D`kG@&DKI|K0ES
zL9|3c(LLt(|LFMt>Fn|9`Ty(r|MC0(MYK6axIaqJJzjH&Bby^RsV+;xL`%d;OlN>P
zok2UTJ(<9>RDWT2-u3^@(z_@C000_vQchC<00RUaF*#svaH6ocxys7X>gx0J^z{Ax
z{xmZk=KufzyGcYrRCr!RkL9+)Fc5@O2vQQH7f<SjySrbv_kS89aJql?%(t7#EKpeC
zsg9LL0RW(iyE;}O01_lo$2oXb8zm)x=r0WX^U>`gD1U(3317MXU$s;LuoL)Au9qej
zKs&JcmvP$f)|vz!+c)}qI{B^0CzjaXQSx1qrfsh0E+wDWVmi*h?J+%L;Aitu%O`lS
zmTB7yN=D=D?UIqvHLXC&pz&7CCBXA2N`~)c?h%1{miGv}q+-0^0X6#=G6o^482|tP
N07*qoL<FuvV1k^21lIrn

diff --git a/plugins/tasks/tasks-core/src/icons/startTimer@2x.png b/plugins/tasks/tasks-core/src/icons/startTimer@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3bf2479288f8395122d5e9f3dada34c598c8fa5
GIT binary patch
literal 1483
zcmV;+1vL7JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000G&Nkl<Zc-qaE
zX-r&I6vy$4Q4=-MPx?tJEtIuDfkN425xRj;IxGsJfdCd0VjA>Aqe7yoRH=xyH0;~J
zu$Hw2E!!|`eKW(p6w-kbhBl2c0*00pj_16*H+c+iW-u{Tl3y~sd(Qv<@4e^Vcb^#m
znEjWS{cj9BeE85P1qB6%kaXlXM2kG(&~nexxfnA&JdtMPCE@dZ8^B;6qz?g}qM{-w
zFE59RiVF6(u#JoL5p=%JJ?{~k*kj<qg9p37pcjxlWQPPwOG`l}lYv^ThPk=9U5t*7
zLU(sJNTpKV1m!ddI_J4*(7@{Istycz4H=-Mva&Mh>+6G=nHk8)$bi||S%XlFTrOvG
z^g1T~LIMmL&}y|T+%yeQQcX<_jE|4A!bDb9)>eIe{iEgO<;j(m6*WP>H5$$0-Me?!
z_&Ca;T)ocyjMe~(v0!69CDqo}!qn6hOixeK=r)&@mgbt9n-|WXKfihZ{(U9JGWt*q
z#ZnIC(vooo+VqQaj{zJBUvN7#g=1r5tOyFOV}~?S=H9(~s<^ngrzotU|HZg);lf6G
zdiqn!rP|<@V@FV!;s&r2YLJs-DyYfHNg6$kT#aoEPiAK3?<pxMk8#?S!sk3_V4X}*
zE@@ExaI+vcY5*TPP#{$@ts$|nurRy0xX1`;X=#~{j*g}{jeeUD%H?$gyTielfeZ@j
z?CfNxAKm|nQ_kpv!pek%gstS{<j3>#^GdN89?~E!(&P+e7&FjCL4$*X>|VzyT*S^8
zF|xC>S7{dTFwz)`AxML?hK7cC1Kq|9Xz5f_sZ=a@z)au>88L8OC&@rkQc?;QX(T?A
zaD0gj@NuNU>v1Qh)|i1ORIy5>k_D4h2xEw}w6qO0k!qXc1$H^!JE0}9ZSqk?9Ja+H
zMO>VU*W-4>6O#t++_}So)2GHmg)s!iFOdPq>w(~u|1LOO^8@Frfsekpk$DN*B}h7I
z^znN8F~Bat$jAuG#KgoT?q$XhD5}1A@nWK<ECPHRW5A;-9GnV*!S-ig@XwD>G$@)A
zQ6nC;Zjs)8mVhln+P73RxNaI0U`!zKZF(Pqeocgc_IU8Bj{=vnGhlzsAMA7eHWH<u
z6%Gy!eu|pkqPE6V5whE`wY3!n1_oewc$l^jV*-g+V>ASICb0P5{0Mx|&@pK^9LWy?
z>s%l3xO#g2vMeVPwbKxZ$%BaA^9qH6g<+Uk+(wKMB*$^oez!i>@eY}2i3Rss2{@IU
z0-LLTV0p!B>ts$;%h!3|ylKz?PPy(VZf|dg{{DV4v56I|#x}+Pl4G^!z^DDgJ$Sdq
zf=5FX9IXrmJ1kVoAHBfhd-w6Tv)tT84d7^XFQbx@683#S^?*j!sNfj!KZ#4tS@3L&
z6{qzB@Mwwwim@*~0ajR`7C*ReAINgeHUG}_m0bp~Qd!Wzb^e{u)6)aJy}e{)6HmxF
zY-jY4I9G>(drOQ_jx|MtOML_!DL)N|^Zdc$%5gBya$SDwl1qrr02UpK@Ipd&zT3BN
zvqlIsvWCmDh`VG0W0gpxqcjxUnxaf|BNAL1&Vggqdtg%-1P6ceS~0)u7N#?RqB^ki
z*Lf4g#l?UZ5q3#LNVTsx1xFhr_KkDH*=<Kz=r1<KL9gyw0-WMqVCOFiFQs&nH8wUv
zM@I*Ab#?Ki+LoUHr~2^yGUZqo<|$f)xc5cj3R5AxU=|h@0u?HfYF!ot4t1fXc<fLc
z@|C^p%<~4fp&<hTBUZ@g+=;o0Y$2Z<F2Pf;=9Dq|?5a;%nY<H<e9`O+%OYQ}tqvCB
z58JBXB<sq+=fv{<wQs{ih2CIO6{t_0b!EUC&*bCuV1XxCOZ|D4tt<UPp6S=IMZP;6
luJqkTa;?g}U;d~0e*+Kk@o1s0C>;O*002ovPDHLkV1mJh%r^i4

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/stopTimer.png b/plugins/tasks/tasks-core/src/icons/stopTimer.png
index dfeccbaf4b8235bf3c66e77098fa0bc50f0a75fd..54502704d26b44acf0d2b337b36b1845cecb2649 100644
GIT binary patch
delta 500
zcmV<Q0So?#1A_#R8Gi-<001BJ|6u?C0m?~4K~#9!m6J<L0#Ovl4Qdy(sxMO?qKGU5
zdlB@SUPMsPrj6SWb(JV6IJi@A<3<G^px!BT)W&qOv@30jRzZvDbdD%Yaw%H;=FYkQ
zbN~0A`>+6j#q0I{hjDXk5g5!MGV<*A`#-7e$J9TGsK^yEGJk9^ig;vMhHN$qwOS48
z^?I+RnEFwFMX0SH6T=4Akw^rp)vBTEI`4EkD(76GmSXCUMx!+N4VfA)VLB8Ffyd+d
zayT6C&1Una-EK28Hk%DpRW&G&@`nvVsZ<IyP2+C2yDLf3M<$c0wpuM_hIGp7@5v8?
z7seRXtTq}A=6`azx^}zW2nK^KiU*LcC<+;H8cbt*AD_<$WPmd$2+hQtPG=XFE#be_
z#3JTNcse^j3}^+pTn@_RvRbKBm<j96$}HTj&kG@KU?9iiaVQpxyi_VN6IShL6&}vF
zg^)Hdn8A7>olYBtLP5hiSs$x@x(UyhheAj*-vf6z9Bl^NWdkn`&*$?hnk_bu*PwH;
zCxkS!!5H1dKp+6ISPT-01SFG5>3-i1PiI>~Nc-(Aa6Fxz`t}k$o@@vq&GOf4yxUxW
qhl3R%r1cDbqqa5&`tGt2(!K$xc&-ulwAAVV0000<MNUMnLSTYl(c_u`

delta 377
zcmV-<0fzpA1c?KX8Gi!+001a04^sdD0GUusR7E~ZaR2}RK1*;uOK?6*a6e3OK1*<u
zny)@faH6TY-$E?p_y2r~q=by5j-a@ct-rh8@xR2-%<uov@&DKI|2|7_bBCnm?D6LJ
z|LN@U_x=C;{{R2~|F*%<ow?9aYJlDE_}=yZRAG1HM=^+ysDEB_h{w#==ubK5`2Wf7
z|LXbw@m)so`~Q!tzxZiV`)*hKZ&=OT=uBsTDq7L90000AbW%=J00131aIm-0>hz$m
z-GKlA0F_BZK~#8NP0mLG!ypVrK^X%f!oAnj-pl<D7c5wKcK^Xb;2H8%O3wiR#^s@u
zoB`P2i!g2LF>(;T4NUBYzI)tsBp3xA4##P4i;7c_Y2U4<ov$PX)tdKTT;y4zY^cru
z_<3pcW=TPg^uIv|crfiu<A)$H5t)6}_$D|VR;`lci!Xxqbfp$}CkUQ{XEF<WG7HWh
X*}4!}C%&n?00000NkvXXu0mjf?NY?w

diff --git a/plugins/tasks/tasks-core/src/icons/stopTimer@2x.png b/plugins/tasks/tasks-core/src/icons/stopTimer@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa3486c0972275d0a9948bac4e8cf64845dba28f
GIT binary patch
literal 1141
zcmV-*1d98KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000C$Nkl<Zc-qaE
z+fQRv6vlZ}AN7AQzRf>iGKn$q(Oaet>U7B1846UUqfEVon3P8zcy=Op2ni5E1jIn(
zS}p}nTP}sR&}j>m7Giu5#&F4m<@cSOb8_g_93HgEFKN$S-`d~ad+ohXD@3H?zog=S
zW8nDsxFoHut#1Mk_zh&hg+@ku=Fws*a(EkzfY;2=|Fr=G-v;wQblTh7rKhJydV71-
z@8&iw_O_|>Q|<Yz*+ia!qobp1Am|nFBe-IMuC6ZW@9&pTC?v61>>BIq>oPMlBYk~+
zx(RB2Hg&G^Yf%H)Y}Nn)uY)Cuy1Tn&etupek%)M`UWrDdMPZE3=TkK~9h1MoyG0FT
zG8q+Zn*0<E3=GKT=BApMG&eV24h;?ckxr+>hlhtD!tcpsGPS$Ad!oltLv2py@06?o
zBvV1-PZSLf4$AiSw(RWeaCB$;`}?txk&$>^UESHi!9f7AN-m6HEH%_}$utAM<Q8Y1
z0gOa1xGPTK#>R%41PM>kAxEkt5{aPQZhwiyN&YTGLqo$0kH_<pTGocP99O2oENlRs
zu)#;iEU0ie%+Yh?A+#wvO-)UI*3{ITW7-4e=Q=QON)yyF2kS?h1z$-6czBC}tYoes
ziO1v7R4S#I866$ntE{YKTr#)K47GY5)9$!c%7B+alarI`^uzsMm~tf-Bn~(nj!UQ0
zdA_%|7bp~?!yL@ToSFe|DFf3CT3%jO_d2F9h0c^hw6wHjISV+9lEq>Ob1;|R@7E2?
zlroUvsTK?dRdB#;VT4K{u&!YmsIIO)N0A1K#W9DTPdhO)r3_rKVgrGI3dBL66vORy
zzo3cE&dyYcxS*a-+YJ|G4XmxLsbKm-I8>BkAbuYPT=n(!PW-kN0y*v?mx~~`3!0j;
zOR&1Ss<O4U6~<mxih-n|#>U2n{yXo<O~@-k?pqcO)-4GWN*Qdyd+$rA>LW`~o3{<e
z#>Ql6X-QUAR=9<fGT5T-`;z$1X$flc4kF(3i;IgYilRiZjg%7D5}rqL*!08_)EWjb
z<;GDwK0YoB3kx)Hh6)a$O(}xy`BR7d?tN?tY7GMzt#KJ)YpM4E>j6eiSa3?=k1hVy
z7n1&=-V)Rr22lAbFz`&j6J}>;Wo~YcM$T|T#?Y?hV2eMgl5}I8C8#wFpy*W0FC={D
zo0^(ZjSv_)!Lp>VOSTXj0H5qVzAp#g*I0sD!vK;Rpz}9$6CE8Lf)^2WNebZF{qmmd
ze_L${Y7GOJ;%lJuSIsY_JSB&Rhh<`7LZ+vubzHI9&m{Hqp(Us_3}EjUL@Ufi^9yEM
zTO02H;)*%%O6uzemY}w*0h5upz&F~7nFW`iHu}gWNq3bcs5Ku%mWVj+NTS|u32JZr
z-!AgtV@bF^w*<8}Hn3Cmp**ks)DqO**ub{^1Bp8;EkW%+Vv}K#$N_=k00000NkvXX
Hu0mjfIe;AT

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/trac.png b/plugins/tasks/tasks-core/src/icons/trac.png
index 2275f30a11d0c2f16d16085f66875485670f37ed..dc10451e2dbcefac736a8cb895a832ee7ecea8f3 100644
GIT binary patch
delta 302
zcmV+}0nz@~1;_%BBYy!8Nkl<Zc-mw5|NlP&B^b^)>Ft9H9{^%;ba7k;a9}ZD4iM`T
zYrs+<wnI|L48#pUJQ0Ywh%vw#szD9PcLU=8P}~a@)5m8(Jyh{aAm#z$SR@0kLe*RX
zVqRPZ96{2M0mNEJ{4G#5<v=Wi%>Z*C&PUR48>(SB5dQ;WCx0MLg34{jX25-r$v~U}
z#7~h7U;|=ZD0?^5fG^k#04ZDm#C_1v2Z=F41JV=9-v~8eH#P&fpiTuT=!9yhLGn@^
zG)($|SR0!GEI|Afs`wGqfGtP{z{14~Uo?6H@e3fH55z`5{2k4J|In0)H!rY2!(bnh
zrjtNC7l_+{SSOy40Wf?Ji0=Zi2ewRxVF0-p0OF4@z4l!a761SM07*qoM6N<$f{EXG
A-v9sr

delta 704
zcmV;x0zdu80@nqQBYy&(Nkl<Zc-oy)O-NKx7(M6SJM(7d+33tTX*p?$l+NgECL$zc
zNZmx6s9E#_g`l_)Nt7t0eCS{cOOsNv)WSq!tc*ezCTfc!h&B-|qE$#y6bStgQN6C(
z!cbiF!Grtmz2EuHch3EQwS#-z%9~S|<4D;F;y*&&1qQn)<9{g)w)R!qMuS9Po73>v
zmbLJU5JIAd+}{b7qo7{sJ^sDAGGeh92Ph7W5XZBkQEAz61_Ce!rKlPsueV4<BUV@>
z5}*xxbp{Ey3h9dV=fMhZ80sL9I|DwR0Y0R_$#t3V^g)#ZF4ywBCA_%BPAMvN!n0}M
z?P)r;*9oyzuYW&|0l%*T^QJO<n$5K&5M2<}wsc+!HYX+uL^vFjn*PaI@YA?XxCr!^
zF#I=wcU_uwn+8@cUwW5rvxX>c>WE6%7SX4L2?m3*8*)b@S#}GY@71Kvf}e|&$kls|
zZNQH@ur?_~nP&8U415uCyS=HDw$`$2BE3Z2CNFeQR)1CtRJ4FkPl0dBp|%79ZsPzP
zg<fyaJxZLL0Dtxpze*fNj<wLdt(&&2gfLBC+GV18lpH8F)Fz+PH1jvOT+Nilmo%u;
z@AnK5tygqP6Y$D(I?Y8ltR>Is^&0MR;@%YSeE_`a%J8|`6-#G`iCOZ|FvXd;kVVZz
z=V2lC#D6wI{NtkE4`URV8rBv1b<epDnLS9>%mPoeuyYTHZ(7io4dju0RHzltAQFM7
z72MehzSaUhk13INADEm3z6@#5Zv7>-8z+E=@W8p+J3<%`o70dHkuqEN+ImOZ*{P4}
zfw?Mh`WP{?PjR=dCe|E_1zWp-{&w)|Q6d@e$T>{pd7QgSpb)F!s<W^>W~?~ZXCSS>
mg{+V_q!!h-ZQ7}o6Zr>KPr}ZrRItYY0000<MNUMnLSTa2=vQa}

diff --git a/plugins/tasks/tasks-core/src/icons/trac@2x.png b/plugins/tasks/tasks-core/src/icons/trac@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5c5532a7e932a38f5dab9c60b1703e07f54bf29
GIT binary patch
literal 643
zcmV-}0(||6P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006?Nkl<Zc-rNc
zPbg(k9LFz>A<v{x{!SLshz({ZMMlr!$z}{I+01Tg7D8->sbNw`rY6m17D7#p^g>bC
zj0GFTG-a5@M2WDV$QZ8gso$+%r+eNz=ehor#iw5P{O<33-nqZ~JLg)qZCiJVb?*e0
z0@bDrfI$$Y6Mqu|e}N4e?@C~n1bV#|5KEe)ku(i_1;t(ql!J5N50f++lz~?u$xDG+
zTH56h3FE;$#R>L7p;rP4U=#F(NZ86IclZP1yeh(EFiIl*E{UgI1O%^HOaQb*Dlj7@
z{w9qtDFnt?%m~;5k4y!s6v_EB9#_Q7vY0u#_S{sUN0Iysi|JIvd}1-B;Jwo+O$7QC
z$xlEk#S|-I%2_Yz01H$LMgkRz<hJx?1f{W6wl92;#Pf6nMB!CZf;NS~HWNqz8+83Y
z`}bMkpLE}Xj=&i>ro@hfoahq7GKqB1OsnQxd+YZ2bOeSdxP&Fkr+#n<PQgcwzCY+9
z@LRVAGHD~40PWy$1iNIni@>l+5%Ml4s@Uf;iI3W`c<+CJ1~%q*5vb7>NCX$s&EKU{
zkNCalGRYe@{+a4UT%Qs<r>?*=MfEo^fkH*hCDn+tVoyP?>0XeiNWR7d>O%Ah!2#$3
z8IkUWKg0C+cVPq^j%Y=V1q#59l&p)!o`7GP0)qNTx8pS0@kBxHvE`gJm|WbOece-W
z5}lC5@0SLXpHd(3^jJQnsQe(EgkFFm`qwcx@m;VYO}<X2V(Yd(OhmWar4w)uos2Ed
d1RmVi@fCGh#Gv~xNN4~6002ovPDHLkV1hzpC-VRR

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/trello.png b/plugins/tasks/tasks-core/src/icons/trello.png
index 86d6c6ea5e456345c2b81f57e79fed27dfc0bfe3..95806c6527fe1d6f6277fed97f783ac8e707e781 100644
GIT binary patch
delta 188
zcmV;t07L(V1I+=D8Gi-<001BJ|6u?C0F+5YK~#9!WBC97KLaHgOz5}mFa+ZBK>VLb
z3{q=|Y``TFG{f*kWCOs0JFh+efAPtCycnbgrXIt9tIt0EH|yF3SJ1lS>i^z7H{g7b
z97qjb1CX6rv-#5h_MO*I#OQB8_wMU(zG){JUU>ca2MVUW0X68cK(Ybo8b~sLl7vJ~
qQof9AfH4qXAwe@ptufpHN-zNTpV&*_={Z^e0000<MNUMnLSTYe+E(2F

delta 374
zcmV-+0g3+20fqyR8Gix*005AYXf^-<0ZmCnK~#9!W6-QvrdhF6t!#-}IX<LbzC^2X
z84xjOlrK%2zkmCshg;6y-*VvrR<!y2{Y~fYnKi5iX;3a%{Qv*|pTGaS`0(}B$8SLN
z=JWSIfB*gc`wzl>_37KYFF%0Xi90W9R4ipsDFtZ&nxRm<NPiKGfVKlg)}Fo#7ZJ*u
z^ZW1L2|F(Uodead{o+HQPk;z$sea80pvd~OceN{*K?H$1fB*T5Vgp12#9L?@fFd;3
zK&+E?Uwx!iwM-j~)XSIt`}dE41|azR?;iv~z@%MxHT**d|Isu&0J<26bgGsc)~<wT
z_>Tn8HQamkv2SU^>GsWM+BTo*+IkK{!#^OLh^*nyUli;AVj!S`DZ9ZMRLhnuJ$CcQ
zuRmXZ{QmY6ioX8*1xMe2<d0wPzy1iHx&!D>2B0s2X<M-boNP*PpyEZqsDOkD04$~l
U1x%f~hyVZp07*qoM6N<$f)3WZ%K!iX

diff --git a/plugins/tasks/tasks-core/src/icons/trello@2x.png b/plugins/tasks/tasks-core/src/icons/trello@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e27ba0af71fd1fe0e46d1e02263aef2aa8e1423a
GIT binary patch
literal 283
zcmV+$0p$LPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002uNkl<Zc-mw5
z|NlS3Kw^eL;{g4(9U#mG#1%k%1BibC@qa4eUr;kEp>|+(07zmN6)nYuL3XfVb3g?h
zEQjF=Y!0|iM+aQT<^Ys9zxwRs|JR>?Pz8g`LUX`xYz{zCL@mo<7~OoL9pF4^Kh|Kh
z?%nhM-kUG~AH4nY-v-FWrpA5B0m>bKFD|b>`vAuH)Qmb{)B(fa0idjC-n|>EyyJv@
zw08i_3!+g6j5+{UWn|R@tc+fNro96OygD9H4jAwz*?>1n2fSHMua3!XTpbhiuGw!Y
hTKbz{*KEZ0jsYeCee{GTRD}Ql002ovPDHLkV1gi;coF~r

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/unknown.png b/plugins/tasks/tasks-core/src/icons/unknown.png
index 609fd60936e64abdf985ff5e4a80f94189a45f59..04c30c9facae970d3927510d6629e4202372a0ae 100644
GIT binary patch
delta 141
zcmV;80CNAt1E>LzBYyyINkl<Zc-mw5|NlP&2+x@_=RW~l55ypK3@|+)%s_$xH(`bl
zGJpXK28l}n@pX_Pcn$EFw1)v5qq~M=1JDg3#(;Vt{*Q#~Ni_gOr$gD9P(A~>UZ|(U
v0Jvsy4fs!PAW|F)1Ly)`Fl`JV7Xtu29FFn$Fwy1!0000<MFvhpu0mjf9W6BG

delta 427
zcmV;c0aX5|0mK84BYy#lNkl<Zc-p0qOG^S_7)JdWty>3e+qdf%2oksqGAJS_S_SRW
zKM_O=g{VygAzh3JyLib<I---AnYZRX<Ata1{Y)hohoHrQ*_`vd-?#v{{=?{FGZ4zz
z;tv*x1<%G5!$r)_d+h^Ow~rwv(dolrENx$7aWx1gPLu2ycz<tqIOV1Vv0<WAH?h7O
z#c8wx&&nZ1W+nz`wcN5eV#7j_$wF-qs7f6ioF#{mIr{)RmsW}5r-{Ocfqd0~ckSdC
z%RBo?+W@_nL@w71<d~c;>o~s1;3%9%=sb;TLxtPt7i<H%)rY`V36e7v9Z69`yr|)+
zpyFOoAZcCa0Dp-@_KmH->Rf*Ok?(Q}zMKM@+2<mc%Y*fi{G#ACBcrW41XQ!fSBa#k
zBUV%q&8tk7xqOqB(Q*tJJtWvF5o4!66vlFd$yX^EO~oOgumFi%7TD=|Wh_5SxJ*dS
z0a@=cQQ<`M3SW<;#&S3=p&>g2B(2B)GKamD-b;%Fi6lgQQeZ0(%DR1frN1!_d;`3B
V9vK1%DRuw=002ovPDHLkV1oZo!$trA

diff --git a/plugins/tasks/tasks-core/src/icons/unknown@2x.png b/plugins/tasks/tasks-core/src/icons/unknown@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d1e84ca4569a1c53aafc016ffc83aea2f64baa9
GIT binary patch
literal 315
zcmV-B0mS}^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800033Nkl<Zc-rmN
zFAD-O7{~E}3Tn3*w3-YSyFrV=SD-<-VDJrSHP{TM!}nlQu-F8Xf1*(^m=y)N`5R0a
zV}g3;GfoVjcJO@J#&e8w&Qz}Ja-TZDbo!hJ_Jsgr1Z99{il7W=nIilIuotP{J4!^?
zMu5;%BPaum!W~c^%-&)O`k8<%^k4%QxWW?ZQ~@jCPqZll8gPU@RKbC>4A@fy#2}&F
z`BVmYHXdP0o`?uoQwN9#xs}6jP@xP+!$A%gZ=goK2ZqY<qK!o~mjM%7o3H>S$lD5t
zKn9|=0v7TLb`YlyNNOuMXX6A$aDuVCjvxOWe<-kkK>P#36F|*+z#a8)NXgMk5w!pS
N002ovPDHLkV1l<JeB=NC

literal 0
HcmV?d00001

diff --git a/plugins/tasks/tasks-core/src/icons/youtrack.png b/plugins/tasks/tasks-core/src/icons/youtrack.png
index de7b35dce28e6aba6818218c27e4c59f140fdf3c..437f9eba699325a2db6f610776146ab926b25816 100644
GIT binary patch
delta 540
zcmV+%0^|M80;&X%8Gi-<001BJ|6u?C0r5#hK~#9!WBC97KLaHgOxP8#2jTxftOLXx
zKr9Hvp+H;%#Kl1D3&iX|oC{S4)`M&SNH7_QUjp%8ApQvzL&ooc_!kiO!3;q*Km~|D
z0`V!B2Dge$KU4ene*j^Z@=eGF{(~8UYycAwe*+2Hm#qIgWq;G<r{916IR}(G1H#{a
z{65#a_QG={LqINxL^ePeh`)m*XKuav1g!DTkF)=m%KrMlNc{Kz!&xst{I=z1UqTId
z0}2yl1HwTPu0Uu1`1R*3$bg4u*F30bsQX{tQ2qbiOv(TMkLEvr|M|yxhtdsyp@uji
z8&ClfOzPeD5r1s^O7$PjO{MSvoZOoJ|Nj!{Um&^g)}3FW;wi`mfTHSueD~f@U;`FQ
z{GQg90ykiJSLlDRcYt!iO*_6r#iNl8Z~+N|ocHk6=S%+&rM>($hwuNU9-sf)d)@#4
zoy!CCLf-QmkKbQG3P>Gf1K6Nx;D64PLmz+r_;&99;eU*mzySR7e~HxZ|3`CQeE;#|
zeA<KqpP-t51F<=J7<`18o;qRw=abi8-1z<H@7Z6!|DN4{@#(Gj?maNS{{iCF=;;6?
zF#(9bKvUv>Jh&f-tI-XB8PWyBpMm%Q)FzmwA5dH4pnNv;q>OBcKa|Y}#0Jm|#swAg
e!kU>V!4&|`u!XNCI0ZBS0000<MNUMnLSTY^2o$sc

delta 318
zcmV-E0m1&N1kM7G8Gi!+001a04^sdD0CG@FR7E8}p2*0^|CI?%V5nPEd1Q31bA-XS
zzuzW6p6cxOFi4>Pq9*^pYX9ZHc7w9Ecsh54v;Y79OJAt}<-z~&+H`@kRA#D@pU;+_
zyJK^%aelG?syQx3ptg{4hLE>LTBc88siv&IbAhreM4viQqkleBq!j!s9{>OVmq|oH
zRCr!xk5`TaK?p+)l|$z|apV23xTtGO8fh%?^S}l`N59j*77*be{5)F~qiPL=pqHvz
zg<$^$ymcWs>rX--@Y^t_l$*`N5U7P6hKZT4jYTU!!OhcM>yER75)cs*Yd~`fh;N`+
zGI!NdLYphUgf|*l+vKwL8-xXGJq)+U2%Mxy`WHH9OnL5e1PKsQ-~W>O11+})vfWKx
QI{*Lx07*qoM6N<$f*a|R?EnA(

diff --git a/plugins/tasks/tasks-core/src/icons/youtrack@2x.png b/plugins/tasks/tasks-core/src/icons/youtrack@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ba3829c6ff692a617c648efc781896ba171d10c
GIT binary patch
literal 1120
zcmV-m1fTnfP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000ChNkl<Zc-rNc
zX-HH-9KbCKI_RYOP+y9ID7v$VPP<Plf*|N3qUeOmP023pus#^39cyK6huvN)T4baq
zWl`&DuBPGEmZ@u+o9^M-9&h^3I&T|i-=Pu|^x?<y_Wfu6znS^ZdvE*@LVkY}zkfzx
zW>9i_=qPi4EzkfQVDCu@>;$68?*d>5Nz?(D1H=GYzyct`Hy|4b2gZ<o)&nkbKd!X`
zyMf+7BGoyji6lX-<Smsvi->;!PRR-2fagFT;7%J7ieUnl0QKbhxtzc{5||741NJ{4
z!SfNA3S{DC6cd<0HQ<CgniH(%cAn2^xRhR8q0TjYdYGd(oJ%RJ+7gvznWYd-?gRn=
zJ-MzF6X*)Kg*w5VpSYu`G1l4MLA*wYvda3Ry|FKTh)Db-zj!&OO6>wY+jw3`synlw
zqD(9?%k_-Xa*^4<$)`xw0N!o}cH~bq<@y#$?6vtQd5Q(y9N_Yxo^C<9=+DUQ$m3&T
z(~2qt1Ty4`a3R|$?ADuFpHXry4Z7M5`H(!>ifmN{IELep2G<4CAFivxQUVw01_6o`
zuJXIJ&_}?SQ=*BPgp?7R(S?XDsO0=8N&;ra?exsV%VOgPfmzrsCGd_8-g-9M?327f
zUl<)3>TDqzl!zXkS^Qf9F9(^0z$57nM&P!TfSC?HlUQK%CQh5%fD*^s^vcoPte_;H
z0-LY6kIa|*Hw&cB^os9M`s|8KDS;N9s-Bd5^$MtZakz7JWT5E7MjPYbED%4)!M6*K
ze_O-E>7)c~bg(k5sFD@PjtUSJC|3?80t20VyO6k7CMGUlN}!AmKB#*A-7AnVwh?#k
zjO&3mhMx0D9(?rZ?;23g@Gil+(@z_j*fc4DR62Os;dF=7<!;{Fny?B!LEWW+C^YO4
zTD1QzS`l&sMV;J%Y*+gF6d~S0u#;HX6H)@Z*pVf@_-OD5IIUWAe}r9d|I;M-+xQ1k
zWI}$mz*5bS66gmsva?WIZ}&W0(2r6bdN5L4B4L~jnGK$IMe!F?@mzRuG0E{R>n`_2
zl+IdjihO3Z+8tW&OynK=>Pe>R$stv5H;mef@=uo|SCePtUurCctHK}u6e(5>&_zr@
zAy(mQA~NhcL*0A17f}|xwD7D6^r54Qe5;VaJ}UT?(Dwi?D8-dr6Mi|FEKLP`Qe14w
zFFzT!MQ58u24DroQBT@qLIV7LeF!WE9CBYdu*U9y{VAMG9DcUU29}a*{H^FOB(M?)
z1_G&%htfarSyn|x-xIhDY>+ELEoqnsOarRhk(47JwU5YkQCrRhcm~b_)2Zau<dAWX
zIS;VZ0<pko($_HR-hkE$@FbCjMqmW>e`jDK5!wN42UY{41WroVsDn$VwhAmDBOcz)
mV;kl;nX#p^OYq;Gj(-8n3JgF@>8qyz0000<MNUMnLSTXqLl6@H

literal 0
HcmV?d00001


From 6370a1a86b76b0b9b35244b1edf8f3e3f2d6d854 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 24 Oct 2014 14:33:23 +0200
Subject: [PATCH 069/132] cleanup ConfigImportHelper

---
 .../application/ConfigImportHelper.java       | 72 +++++++++----------
 .../src/messages/ApplicationBundle.properties |  1 -
 2 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
index 068cb4b7e0f2..ade61f35e6e4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
@@ -17,11 +17,13 @@ package com.intellij.openapi.application;
 
 import com.intellij.ide.plugins.IdeaPluginDescriptorImpl;
 import com.intellij.ide.plugins.PluginManager;
+import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.AppUIUtil;
 import com.intellij.util.PlatformUtils;
+import com.intellij.util.ReflectionUtil;
 import com.intellij.util.ThreeState;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -30,8 +32,6 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import java.awt.*;
 import java.io.*;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.PropertyResourceBundle;
@@ -65,10 +65,13 @@ public class ConfigImportHelper {
       AppUIUtil.updateWindowIcon(dialog);
       dialog.setVisible(true);
       if (dialog.isImportEnabled()) {
-        File instHome = dialog.getSelectedFile();
-        oldConfigDir = getOldConfigDir(instHome, settings);
-        if (!validateOldConfigDir(instHome, oldConfigDir, settings)) continue;
+        File installationHome = dialog.getSelectedFile();
+        oldConfigDir = getOldConfigDir(installationHome, settings);
+        if (!validateOldConfigDir(installationHome, oldConfigDir, settings)) {
+          continue;
+        }
 
+        assert oldConfigDir != null;
         doImport(newConfigPath, oldConfigDir);
         settings.importFinished(newConfigPath);
         System.setProperty(CONFIG_IMPORTED_IN_CURRENT_SESSION_KEY, Boolean.TRUE.toString());
@@ -81,26 +84,16 @@ public class ConfigImportHelper {
 
   private static ConfigImportSettings getConfigImportSettings() {
     try {
-      Class customProviderClass =
-        Class.forName("com.intellij.openapi.application." + PlatformUtils.getPlatformPrefix() + "ConfigImportSettings");
-      if (customProviderClass != null) {
-        if (ConfigImportSettings.class.isAssignableFrom(customProviderClass)) {
-          Constructor constructor = customProviderClass.getDeclaredConstructor();
-          if (constructor != null) {
-            return (ConfigImportSettings)constructor.newInstance();
-          }
-        }
+      @SuppressWarnings("unchecked")
+      Class<ConfigImportSettings> customProviderClass =
+        (Class<ConfigImportSettings>)Class.forName("com.intellij.openapi.application." + PlatformUtils.getPlatformPrefix() + "ConfigImportSettings");
+      if (ConfigImportSettings.class.isAssignableFrom(customProviderClass)) {
+        return ReflectionUtil.newInstance(customProviderClass);
       }
     }
     catch (ClassNotFoundException ignored) {
     }
-    catch (NoSuchMethodException ignored) {
-    }
-    catch (InvocationTargetException ignored) {
-    }
-    catch (InstantiationException ignored) {
-    }
-    catch (IllegalAccessException ignored) {
+    catch (RuntimeException ignored) {
     }
     return new ConfigImportSettings();
   }
@@ -108,7 +101,7 @@ public class ConfigImportHelper {
   @Nullable
   private static File findOldConfigDir(String newConfigPath, @Nullable String customPathSelector) {
     final File configDir = new File(newConfigPath);
-    final File selectorDir = CONFIG_RELATED_PATH.length() == 0 ? configDir : configDir.getParentFile();
+    final File selectorDir = CONFIG_RELATED_PATH.isEmpty() ? configDir : configDir.getParentFile();
     final File parent = selectorDir.getParentFile();
     if (parent == null || !parent.exists()) return null;
     File maxFile = null;
@@ -119,7 +112,7 @@ public class ConfigImportHelper {
     final String customPrefix = customPathSelector != null ? getPrefixFromSelector(customPathSelector) : null;
     for (File file : parent.listFiles(new FilenameFilter() {
       @Override
-      public boolean accept(File file, String name) {
+      public boolean accept(@NotNull File file, @NotNull String name) {
         return StringUtil.startsWithIgnoreCase(name, prefix) ||
                customPrefix != null && StringUtil.startsWithIgnoreCase(name, customPrefix);
       }
@@ -139,9 +132,9 @@ public class ConfigImportHelper {
     return (SystemInfo.isMac ? "" : ".") + selector.replaceAll("\\d", "");
   }
 
-  public static void doImport(final String newConfigPath, final File oldConfigDir) {
+  private static void doImport(@NotNull String newConfigPath, @NotNull File oldConfigDir) {
     try {
-      xcopy(oldConfigDir, new File(newConfigPath));
+      copy(oldConfigDir, new File(newConfigPath));
     }
     catch (IOException e) {
       JOptionPane.showMessageDialog(JOptionPane.getRootFrame(),
@@ -150,14 +143,12 @@ public class ConfigImportHelper {
     }
   }
 
-  public static boolean validateOldConfigDir(final File instHome, final File oldConfigDir, ConfigImportSettings settings) {
+  private static boolean validateOldConfigDir(@Nullable File installationHome, @Nullable File oldConfigDir, @NotNull ConfigImportSettings settings) {
     if (oldConfigDir == null) {
-      final String message = !instHome.equals(oldConfigDir) ?
-                             ApplicationBundle.message("error.invalid.installation.home", instHome.getAbsolutePath(),
-                                                       settings.getProductName(ThreeState.YES)) :
-                             ApplicationBundle.message("error.invalid.config.folder", instHome.getAbsolutePath(),
-                                                       settings.getProductName(ThreeState.YES));
-      JOptionPane.showMessageDialog(JOptionPane.getRootFrame(), message);
+      if (installationHome != null) {
+        JOptionPane.showMessageDialog(JOptionPane.getRootFrame(),
+                                      ApplicationBundle.message("error.invalid.installation.home", installationHome.getAbsolutePath(), settings.getProductName(ThreeState.YES)));
+      }
       return false;
     }
 
@@ -171,7 +162,7 @@ public class ConfigImportHelper {
     return true;
   }
 
-  public static void xcopy(File src, File dest) throws IOException {
+  private static void copy(@NotNull File src, @NotNull File dest) throws IOException {
     src = src.getCanonicalFile();
     dest = dest.getCanonicalFile();
     if (!src.isDirectory()) {
@@ -190,13 +181,13 @@ public class ConfigImportHelper {
     File plugins = new File(dest, PLUGINS_PATH);
     if (plugins.exists()) {
       final ArrayList<IdeaPluginDescriptorImpl> descriptors = new ArrayList<IdeaPluginDescriptorImpl>();
-      PluginManager.loadDescriptors(plugins.getPath(), descriptors, null, 0);
+      PluginManagerCore.loadDescriptors(plugins.getPath(), descriptors, null, 0);
       final ArrayList<String> oldPlugins = new ArrayList<String>();
       for (IdeaPluginDescriptorImpl descriptor : descriptors) {
         oldPlugins.add(descriptor.getPluginId().getIdString());
       }
       if (!oldPlugins.isEmpty()) {
-        PluginManager.savePluginsList(oldPlugins, false, new File(dest, PluginManager.INSTALLED_TXT));
+        PluginManagerCore.savePluginsList(oldPlugins, false, new File(dest, PluginManager.INSTALLED_TXT));
       }
       FileUtil.delete(plugins);
     }
@@ -208,8 +199,11 @@ public class ConfigImportHelper {
   }
 
   @Nullable
-  public static File getOldConfigDir(File oldInstallHome, ConfigImportSettings settings) {
-    if (oldInstallHome == null) return null;
+  public static File getOldConfigDir(@Nullable File oldInstallHome, ConfigImportSettings settings) {
+    if (oldInstallHome == null) {
+      return null;
+    }
+
     // check if it's already config dir
     if (new File(oldInstallHome, OPTIONS_XML).exists()) {
       return oldInstallHome;
@@ -299,8 +293,8 @@ public class ConfigImportHelper {
                                               @NotNull final String propertyName) {
     if (file.getName().endsWith(".properties")) {
       try {
-        InputStream fis = new BufferedInputStream(new FileInputStream(file));
         PropertyResourceBundle bundle;
+        InputStream fis = new BufferedInputStream(new FileInputStream(file));
         try {
           bundle = new PropertyResourceBundle(fis);
         }
@@ -374,7 +368,7 @@ public class ConfigImportHelper {
   @Nullable
   private static String getContent(File file) {
     try {
-      StringBuffer content = new StringBuffer();
+      StringBuilder content = new StringBuilder();
       BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
       try {
         do {
diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
index 6162300942a0..b02ba924695f 100644
--- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties
+++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
@@ -1,5 +1,4 @@
 error.invalid.installation.home=Unable to import settings. ''{0}'' doesn''t appear to be valid {1} installation home.
-error.invalid.config.folder=Unable to import settings. ''{0}'' doesn''t appear to be valid {1} config folder.
 error.no.settings.path=Unable to import settings. {0} does not exist.
 title.settings.import.failed=Settings Import Failed
 error.unable.to.import.settings=Unable to import settings. {0}

From 6c49f93f01a02502ebea4ff9869e5a9d5b0ad7ce Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 24 Oct 2014 14:35:07 +0200
Subject: [PATCH 070/132] =?UTF-8?q?we=20don't=20need=20to=20remove=20plugi?=
 =?UTF-8?q?n=5Fui.xml=20anymore=20=E2=80=94=20installed=20plugin=20list=20?=
 =?UTF-8?q?is=20not=20stored?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/intellij/openapi/application/ConfigImportHelper.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
index ade61f35e6e4..0a1a1a37b4fe 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
@@ -191,11 +191,6 @@ public class ConfigImportHelper {
       }
       FileUtil.delete(plugins);
     }
-    
-    File pluginsSettings = new File(new File(dest, "options"), "plugin_ui.xml");
-    if (pluginsSettings.exists()) {
-      FileUtil.delete(pluginsSettings);
-    }
   }
 
   @Nullable

From fdb024452db5b3bab7daafebca30de9581da194a Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 27 Oct 2014 12:06:32 +0100
Subject: [PATCH 071/132] IDEA-131750 Fail to start after update from WebStorm
 8 to WebStorm 9 (problem with TFS plugin)

---
 .../ide/plugins/PluginManagerCore.java        | 15 +++-
 .../application/ConfigImportHelper.java       | 68 +++++++++++++------
 2 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
index d80d36822eb1..c4681c4d77e9 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -30,7 +30,10 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.io.StreamUtil;
 import com.intellij.openapi.util.io.ZipFileCache;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.*;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.Function;
+import com.intellij.util.PlatformUtilsCore;
+import com.intellij.util.ReflectionUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
 import com.intellij.util.execution.ParametersListUtil;
@@ -166,7 +169,7 @@ public class PluginManagerCore {
     return app != null && app.isUnitTestMode();
   }
 
-  public static void savePluginsList(Collection<String> ids, boolean append, File plugins) throws IOException {
+  public static void savePluginsList(@NotNull Collection<String> ids, boolean append, @NotNull File plugins) throws IOException {
     if (!plugins.isFile()) {
       FileUtil.ensureCanCreateFile(plugins);
     }
@@ -700,7 +703,13 @@ public class PluginManagerCore {
                                      List<IdeaPluginDescriptorImpl> result,
                                      @Nullable StartupProgress progress,
                                      int pluginsCount) {
-    final File pluginsHome = new File(pluginsPath);
+    loadDescriptors(new File(pluginsPath), result, progress, pluginsCount);
+  }
+
+  public static void loadDescriptors(@NotNull File pluginsHome,
+                                     List<IdeaPluginDescriptorImpl> result,
+                                     @Nullable StartupProgress progress,
+                                     int pluginsCount) {
     final File[] files = pluginsHome.listFiles();
     if (files != null) {
       int i = result.size();
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
index 0a1a1a37b4fe..d33010f3703f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.AppUIUtil;
 import com.intellij.util.PlatformUtils;
 import com.intellij.util.ReflectionUtil;
+import com.intellij.util.SmartList;
 import com.intellij.util.ThreeState;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -55,10 +56,11 @@ public class ConfigImportHelper {
   private ConfigImportHelper() {
   }
 
-  public static void importConfigsTo(String newConfigPath) {
+  public static void importConfigsTo(@NotNull String newConfigPath) {
     ConfigImportSettings settings = getConfigImportSettings();
 
-    File oldConfigDir = findOldConfigDir(newConfigPath, settings.getCustomPathsSelector());
+    File newConfigDir = new File(newConfigPath);
+    File oldConfigDir = findOldConfigDir(newConfigDir, settings.getCustomPathsSelector());
     do {
       ImportOldConfigsPanel dialog = new ImportOldConfigsPanel(oldConfigDir, settings);
       dialog.setModalityType(Dialog.ModalityType.TOOLKIT_MODAL);
@@ -72,7 +74,7 @@ public class ConfigImportHelper {
         }
 
         assert oldConfigDir != null;
-        doImport(newConfigPath, oldConfigDir);
+        doImport(newConfigDir, oldConfigDir);
         settings.importFinished(newConfigPath);
         System.setProperty(CONFIG_IMPORTED_IN_CURRENT_SESSION_KEY, Boolean.TRUE.toString());
       }
@@ -82,6 +84,7 @@ public class ConfigImportHelper {
     while (true);
   }
 
+  @NotNull
   private static ConfigImportSettings getConfigImportSettings() {
     try {
       @SuppressWarnings("unchecked")
@@ -99,11 +102,12 @@ public class ConfigImportHelper {
   }
 
   @Nullable
-  private static File findOldConfigDir(String newConfigPath, @Nullable String customPathSelector) {
-    final File configDir = new File(newConfigPath);
+  private static File findOldConfigDir(@NotNull File configDir, @Nullable String customPathSelector) {
     final File selectorDir = CONFIG_RELATED_PATH.isEmpty() ? configDir : configDir.getParentFile();
     final File parent = selectorDir.getParentFile();
-    if (parent == null || !parent.exists()) return null;
+    if (parent == null || !parent.exists()) {
+      return null;
+    }
     File maxFile = null;
     long lastModified = 0;
     final String selector = PathManager.getPathsSelector() != null ? PathManager.getPathsSelector() : selectorDir.getName();
@@ -117,9 +121,12 @@ public class ConfigImportHelper {
                customPrefix != null && StringUtil.startsWithIgnoreCase(name, customPrefix);
       }
     })) {
-      final File options = new File(file, CONFIG_RELATED_PATH + OPTIONS_XML);
-      if (!options.exists()) continue;
-      final long modified = options.lastModified();
+      File options = new File(file, CONFIG_RELATED_PATH + OPTIONS_XML);
+      if (!options.exists()) {
+        continue;
+      }
+
+      long modified = options.lastModified();
       if (modified > lastModified) {
         lastModified = modified;
         maxFile = file;
@@ -132,9 +139,9 @@ public class ConfigImportHelper {
     return (SystemInfo.isMac ? "" : ".") + selector.replaceAll("\\d", "");
   }
 
-  private static void doImport(@NotNull String newConfigPath, @NotNull File oldConfigDir) {
+  private static void doImport(@NotNull File newConfigDir, @NotNull File oldConfigDir) {
     try {
-      copy(oldConfigDir, new File(newConfigPath));
+      copy(oldConfigDir, newConfigDir);
     }
     catch (IOException e) {
       JOptionPane.showMessageDialog(JOptionPane.getRootFrame(),
@@ -175,21 +182,44 @@ public class ConfigImportHelper {
       return;
     }
 
-    FileUtil.copyDir(src, dest);
+    FileUtil.ensureExists(dest);
 
-    // Delete plugins just imported. They're most probably incompatible with newer idea version.
-    File plugins = new File(dest, PLUGINS_PATH);
+    File[] childFiles = src.listFiles(new FilenameFilter() {
+      @Override
+      public boolean accept(@NotNull File dir, @NotNull String name) {
+        // Don't copy plugins just imported. They're most probably incompatible with newer idea version.
+        return !StringUtil.startsWithChar(name, '.') && !name.equals(PLUGINS_PATH) && !name.equals(PLUGINS_PATH);
+      }
+    });
+
+    if (childFiles == null || childFiles.length == 0) {
+      return;
+    }
+
+    for (File from : childFiles) {
+      File to = new File(dest, from.getName());
+      if (from.isDirectory()) {
+        FileUtil.copyDir(from, to, false);
+      }
+      else {
+        FileUtil.copy(from, to);
+      }
+    }
+
+    File plugins = new File(src, PLUGINS_PATH);
     if (plugins.exists()) {
-      final ArrayList<IdeaPluginDescriptorImpl> descriptors = new ArrayList<IdeaPluginDescriptorImpl>();
-      PluginManagerCore.loadDescriptors(plugins.getPath(), descriptors, null, 0);
-      final ArrayList<String> oldPlugins = new ArrayList<String>();
+      List<IdeaPluginDescriptorImpl> descriptors = new SmartList<IdeaPluginDescriptorImpl>();
+      PluginManagerCore.loadDescriptors(plugins, descriptors, null, 0);
+      List<String> oldPlugins = new SmartList<String>();
       for (IdeaPluginDescriptorImpl descriptor : descriptors) {
-        oldPlugins.add(descriptor.getPluginId().getIdString());
+        // check isBundled also - probably plugin is bundled in new IDE version
+        if (descriptor.isEnabled() && !descriptor.isBundled()) {
+          oldPlugins.add(descriptor.getPluginId().getIdString());
+        }
       }
       if (!oldPlugins.isEmpty()) {
         PluginManagerCore.savePluginsList(oldPlugins, false, new File(dest, PluginManager.INSTALLED_TXT));
       }
-      FileUtil.delete(plugins);
     }
   }
 

From 0854b89902697de2dc58ccf303ad32ba2da3942b Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 27 Oct 2014 12:30:56 +0100
Subject: [PATCH 072/132] IDEA-CR-802 fix "same conditions?"

---
 .../com/intellij/openapi/application/ConfigImportHelper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
index d33010f3703f..b376ad8c324d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
@@ -188,7 +188,7 @@ public class ConfigImportHelper {
       @Override
       public boolean accept(@NotNull File dir, @NotNull String name) {
         // Don't copy plugins just imported. They're most probably incompatible with newer idea version.
-        return !StringUtil.startsWithChar(name, '.') && !name.equals(PLUGINS_PATH) && !name.equals(PLUGINS_PATH);
+        return !StringUtil.startsWithChar(name, '.') && !name.equals(PLUGINS_PATH);
       }
     });
 

From 54c0fcfc7f19f61c66821b69c135d2c20a5345dc Mon Sep 17 00:00:00 2001
From: Liana Bakradze <liana.bakradze@jetbrains.com>
Date: Mon, 27 Oct 2014 15:00:37 +0300
Subject: [PATCH 073/132] fixed test result printer for python3

---
 .../fileTemplates/internal/test_helper.py.ft  |   4 ++--
 .../resources/courses/introduction_course.zip | Bin 95611 -> 95611 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/edu/course-creator/resources/fileTemplates/internal/test_helper.py.ft b/python/edu/course-creator/resources/fileTemplates/internal/test_helper.py.ft
index 9d1842742845..313b9150c467 100644
--- a/python/edu/course-creator/resources/fileTemplates/internal/test_helper.py.ft
+++ b/python/edu/course-creator/resources/fileTemplates/internal/test_helper.py.ft
@@ -46,9 +46,9 @@ def check_importable_path(path):
     try:
         import_file(path)
     except:
-        failed("File contains syntax errors", test_file_importable.func_name)
+        failed("File contains syntax errors", test_file_importable.__name__)
         return
-    passed(test_file_importable.func_name)
+    passed(test_file_importable.__name__)
 
 
 def import_file(path):
diff --git a/python/edu/learn-python/resources/courses/introduction_course.zip b/python/edu/learn-python/resources/courses/introduction_course.zip
index 07ad882088c1aa378ce7a8069cb3fd4390d0cfc2..c44ce1790f94592e46e606b8ab75ae6afe7525e2 100644
GIT binary patch
delta 18838
zcmaJn2UJu?*Sv@9F5uFe)D^`-U5Y40g~df_qJqS(U^f;BR_qAG28bgJ*4RyAMIwSN
z8e?w|ja`JOSV2J(WB>2GH@okx<oh{iIA?FackbM|Z)QF`Gx+e#K;9=tzlD(=`8zso
zaDm)iI$ha2ah9?-3Rl^)uX9nJEKvG>hk4>~W$)4pvSWs9>Fk0*{?g6sUnBsiWYxb?
z6JS)|cg%HoXP~DyzzQu)vPak6n;9AE=@VHq2&09Pov*H{DzZN19^SRT(VJuYEBhS?
zJ9M#sQda*WxB0_T+2w26x3iX}H}0|Nj1N9(`O?;$?Y?%F#e$L}=2pKAZn=Nd_|12m
zdpqp=^T?4?KHm;L9)I#>Q&G|EYTsEy?tJHs=KCMsV$e<Bu3Z~Pn-LyAZ%We}`-{Q3
zSJu_-=D)udJYN+UH@~dgi&+&1d&i9Xsdm@HFzbQ{+gUebD%^vIK1mNh{qW}nbCULz
z-8iH7TsFbWPRXn>7`w@CnQ!bKtH-%B)<~Y!cfke2&pjFy^SHeF^HQ&ok20=AE|3iA
z{duxo|B1$-8!MD=Eq_@SHOs6pt2$!HqjT#_tJ5xxAL+Yhod5h8=Vtht%|BopkzlUu
zx;H=4ZStCRCmq*Z-t}Nt@Un^pzsRmy89n|kB=5udWhI#}jh%PA-c!)^cJi~aMQ4i=
zXP)VKXx)(mSx<9SPc1h0E@4%^t`9%$4mm$yKx2LGXp`tfW5-4J(6FV_q-QFlP4`u^
z`fdL3*sI~qr`=0B{TNX+uw{I8{}-*w=KB^#s!sMzzSnox{goH$zq|J5x~n_eojN9+
z_+wpsS!H?u&Pk^XX3cn%VbpU|$x6%R?lr%k54>*IX-$c~=c>rbd9DT@W^BxjZv0Zz
zBBy)(g*_1mmgO3}{t{riu6F0%9g8Y+7majTkdd};$KC-ar?x#5(`|7>`#5LGwk7K~
z+<kMvtn>WLr0!E2D@}Hdjq*tjQa1dR)2}BpeaLj#TCdKnR&`q2vA(>v&TsN>!(^kr
zc-~>ItQdS#b+dAIS<L0w9|mXUo^0@`D*5sHsY`t;ofN+1qcU@+Tpn$-aa++VlY?1@
z%C|gf^KsSYlvy2PzfUPRS>I#FIfo><+o?mcyz0&;yP6e+jhNqRuI;P052pOk?Mvf{
zk4F^^BR-cmyxDPl=O)kOsxK{^yB5uP=Wkd#>7lY+zob__P2P96x_(*yp#T0gBO?b#
zJpAXkTLanY&QmY%ZWn8C;ZAOwX`!)pb<bCi8itAt(~s25+;+?UeOlS^ou)(Fj2GKn
zPmXWZA#v`>9RUV&$Jm|eHuQ)2{S3<9v`feT6s0VCa`;tgLwetq-(NAd4T){Jcj5lk
zL*DIr;+tnX^rC<IuE@s2OFp$S-8rr<c)`huMJ=Zc$$jNAOm*Odv{*5JOU(Nzf&FTq
zADB8LX4L+L-p=QCUHZm;PQrMbv3>0pS?E{3xOC%mcv*SXpvPHWdu#$zJEY&%uXC5r
zuY7mg`f>Hmv`-Hj=VxWu56^q>z_rHVmnA)e@BM+7p4?_Ty?#LQqKfR+@f%L<Km1R@
zh4waUf2zr3$M2m~J9$jQm%h2{3$3r(_jEh;&F#N^g0CjdnYQHg@Nu>Jo35@8D|^QX
zl_Uk5sJW6t|2gS7>WxR=gtnHJUw)A=m@6(;NNF!&YjaSYgRit*Y;>X+JR=8{g+xeF
zVxkjMV$he6t}-hSCDU7wgA@Qy1$b%<8XpqFF3mxC!4Z-yfMms>zJAu|MX;wOU(m{P
z2B=>yebL4Zc-_#65HGyXj*%HcUAhb8cZpzYlpO5A?#n^Tf+8dr0eX=a@-)bTsyvy4
zPIrlrGytw42AKwBu;+772Y`G8$j2Cz)+J8HtGkke)_0DONWd3KEN4o+w-GYv;$X=e
zUkm2E-BB?x0?dg+n>@XcXJ=yxalKtE>e_i2dou@(35<}~0mLpA?G5Zo1#ex98ahQt
zTWl~-gn^RXtx#;Boh)^}hdLwwjw3Sn^~9A%j07vJ85t?NTl35lVNgmF6y#zIWgC46
zh>(%GO$LhW<V9c^V%VvGPAzAfs2@#O`^5~5G~<j64KNnC;se~7*(l#%B&fi}64m?L
z0NDO(@JtT8(C;hi`+mVvP!lk(bs^a9hr;|s8i=?te)fdGC{!&+xk^90!km#AgI`+X
zulRNWea60D2_Elj58&^WBJdwdpj;`25Cy}O9e{9_kBIPhpAh2v*7qYXnSk#msI_N%
zqzIIt5FfeVKVcr}V-3u?-fCTNy*B}ydPnMlQ@tGlT;wGJKlJLzPAo)5UJ<gE=1mD?
zAR>62mnVCC6)N(KkexMcN+1K(dbVfli;#_{T2^h@lt9MHwzeq4(~9P&su1OSM97Yq
zH6@UNZhHjFP@#po=6q;_HZxFf4`W#p=ph3od$dE{TqNv{LR8=$A<F<58JrC--Q8p*
zz}_J#`88rXafxL@VxI>TWN=i|-0futf$DnOD=|pn&!-={-O*UK21v*tWGmfGsgc(U
zk#olg*)>3rfyQ_2%sv9`9U^26@S6;Dw?i<^cZVWm)IlvvvH*Kwa2h9caAVzyP(gdO
zYz)B2;NXqzZDpN{EYzhFn<|i*mnT-p7|!0MKtTpab)lU-n%mxj4KG5I+C|9L0Gtep
z^P^UtE<#t_B4n!|#$+J-b}<x#iclC}0s%?}TILpN!Y_ITTc}6vvptVuT|9BB0W88{
z5<Xd3tEL1p(C4<nv>?@kp)<N<eXxN9vw;NjK~vfqYv&bZw)K${lI)Ux_w9kio+GJm
zBap0Y>(5$aq-+x*a|h96pxJGdw7_%#TVDD^y0iygPg3vD9am#nED(`_8eGFzFN|8d
zLTKSP8ECSrzdRh+&IN8yBxTZ*q<xV+BS9Bi%VilrLI$dB-GxRXq!_(asAVbEO$lUx
zP+OGHI*87kQ85|>*cN~x1LA9i4lDc&(~2$Bf4`ky+#1EX_~Je+AEDDgLI!eH1hbjN
zDAFZD_7HxP0j!#I*iwwnJ4eb~ZJH9u;3mz(r4@Um7{vlS5nyDXHO}5_Nin+Q6e;Tl
zzscYX@NsrvZx*9I0ACC+GSCL6_SB)OVpQfBDa!yT8K{L*3{#AP0i-1+UaWJppgyKx
zw8Fvv>zz#h@jMSyYv+MpeQH5U@a9}|(T*l%FsiZhL}m`suNW!DB*3SCBCzT1j~ZmB
z{|AXo?Eja{&i@aaNtgePY~~zmn1iOj^f&S4c~(Yic58crG5t3}LO?5{O9%Yxz!>Sb
z;P*S&T~gnQD(vC6{m72<^q(F=h3xb;7^>s)zlG{pdi!rVL*`NWMx~v{(u_Aou(d&g
z>gj#V23vxqb3{e}Xj@Z+gn;HmqlTt?bZ-5Zqwb9=*?zsI1TspOG+Jq-fFUPei3~Aq
z^p>X}3$?|!soyUGE#+w8?$$Uposr`1X^a)AfL-KG31lF*SL^hZ+q<HYat~}ag)t)Y
zy)L&Soo{<qxg9;K50?@Uj8d<LaE2NLT8-*eg8PZ}`K&qvrM>7W`|d@30vYJ|3l;Tr
zd=6q%o<xNNjd&`RMncEIcS-gv;2fT-Bm@*0gGN68S<o=>S-7BK^RpQw=u4l9e7*j3
zwkDUeP~RJVn&g|=Q;?sMg+4u2NeF0WPo#cQOXcraj2_p8OO2oxfq{G;Uu2gpMy>1A
z((CKZ6JelV@AOB%)j3fOv0133Hb~k>BpN`gAF3n-)Tbw^eR!9Oe!K|<KM0qtta*_@
zM(LslRt&LS{#U%<&#1pH8}fOOknT!m0EJzXV6$-yx9WziHPA*VAsy|hQAr6126|hw
zUkFj}`$C9H@qKHC-M9!HtL`mp`KdmE3}kiRkLsDQ*h8bo#GhXP#o(%DA|@<Gk@v!-
z1Ox-+-Mc8LX@6HV*J*dJ5^tv5i4wdyerGt1lakCtkknC#lU$iKK&=j_n0g-4(FfIr
zwMJ&QZ6t)ku_yApeP7VC^rpz2t2a%#u<gFlM^I#Nb1qfn#!q=5?}<dv#{y>Pb(MsG
zBt6l#>sti{Hh&5V(C|M$5=T<6^%UeEztalcycS4xSn@h({i%x-(h4xGuBs#iR2PYo
zukJL})Cv=I-{DIJ*C3}qJ&^PdQ$e)zAMc1dpQ<<kmQ@u+RfTh^P@hXuX|Tu_0Pnb>
zk`PdEPsD^-BDV4z^~b0X4ZR#LON4HT47C077os5Jk|<t(Tv|jGoXkeyr~Ndg&qP#p
z026vqB_SY_Xq0tvr4X<6=Y@Ec)}2pe*k87x`{$x$0YME3WFY1F(NsYuQ4l0u6{U@m
zVP^IKbqmYqr<S5!scz`_SsMw#u8Kl;&;DQ~1gtQ5!Q&T@9Of*ltx}-WGuGM&mFAu?
z;Id%->AqSZD78Z-XS}K6b)09&^rTdJR#46Yc<?Eegn-UQp)IG11h<TT7rB-AJFg+=
zWQ?F;`N<h{*_@kX0n5f$Q(GonXrv#0_UySysQqtoG6Et4&G~JhpyT>+kq(y=63z?e
zxM(589M{ZEYC3v#7(yqkdU<NPt6KTC`j3kcmp0s@*?7!`qW~&&^jM9c$>XS?2~9ov
znIu8%5z&T)k1VI5LVOa?MN=k<7GMkyt0V+e7KQpA#)ACH3X%L)hZ>0dmKCB!Gq_?B
zmA{miPZ!Kqk^IG(=t^0*M6XA5qF#?un}aJgTM4jSI-rse+O1K@x~!blpNHQ3(o6c!
zGV??jDB?gSm41+yPIvtGBI$scP^yv;(EBK~zqDGg-e|vIeQCmeD3M^ke@Sm)u9uX|
zq6%*F3WE5W5-M6FfElz`B_W{D=+e!5y%^f7mcqA|ui|)%QkW-SRC~NV?$w8Bsq>My
ze9uLqbNcRRLFd`s=~QQ3HY)llSlUOV3_xbPA|wRVCmIdhRUy)~>7S&XXF=B)E+-TR
zB*=QFnIP9|XD!k7`X`ZpQ9rMwx?V5hHsbp+{9gaFsGun`k@ClI$&iTX#32!-Gk&zy
z%n$GsY*$GL?az^=x3>4^0{Cp35LM*AJ&7tf#3?{ND<tUHCaE+`qySLEwyGoq6c&lL
zZ`CAlzuc8u!etlPrUWudqqbNwY}Q)zWK)c6u>*9uFi^<mqjWVk(#_ImgIt=kPP0im
zK<^d3QDhO?*hn*=F&(A-pyFtO9v%82A83bf5c)K<d&3cGy?z!65Bjo3){<*tPm9b?
z&P4Clg-gmHK4lRoZ2e(6C;G6t`Sx?bUtmtwaC7oyjUhU}RxTmjrz1=6t+i)NNS0Lp
z+SP9;P?hMRO=~+M*;>)(xYOEHYD29yf+n<E&JkGw*pSsK2?6CqqD8A;2zhQ(Eb@PN
z@ohQLIlS@S&EueR1ZrK}5f4@~Mmm`pg0IrJ!bum`9Kg(((CQ$x@FcwR3Ps}26rK?j
zr>+v!v_q>-lGBIkDXX66f!>Ft`{dGL2eK2g^bFcW-L2BNOG7?E<SgKvR;nZfG$9g=
zUb#!O4C2}}^g0L%hJj=4ac|XEOD?9Mk}L!L6{30WyW%IRG?DK|D}$jQ^;#~KDn$J#
z;6~)BBm|^@BeeaN=y2Xc!P!N*qTTyuZVr1T7k#rlTvn#vlt2dBxcm;)5-Mmh@#8DX
z8_^;MbmdZ&gn-^eBfDjH1SNZyh+_TklIz5kM~g-6R^XB}s-%ZV32o~1MBV^;+V?66
z0qMn{qu>87C{gB!l+4O`Pn5W1_Yx*)N_GWRlB`uiXDLvm0+6>BsU!px7=v18tr1jA
z$rMzSmS?(fl_Pqg=)4IptfV@Evr*bCKQv{oRB9#^c6l&#5F=++SZ;^8mXPIzm7U;h
z;!_YKC+DAp)GP{lEI2G^JvvX&iX`*z5XV-}6@4~5nyXQ2O_T;n&-c={EG&RR=BOkD
zbiNl_G)L5IKg|#Xm-@|?a_(H3B}y@ejMLN|SI!+xpIswT0GMGjRT2WK>BV()6*Koy
z>y`Paa(cKdRsts-FiKm^h~Si5nI=-=G<~OL^7)wEPlFT|V#fB!Mw6yO3Ij+Hg$_(D
zqtY8UB4v7%EOPqm1TxUV^k*bChTjQpp?=?8r^4NN4`>m3CGr3;+fr2$0(#X8)u)yV
zv0pqzB&%x5A4GoM<X9o8{+hgj%Ab(U?L|s&ScH=&NTuTh59AYI*4rKqxN!((-Ikwq
zAj4t4{HznwaZzaSq$`5vecuY2OW%EK$HlF9f+*J>O*lza$7)q`pS(&zGYhD$<5dy@
zQbwWd@q0xzXA7JDR~=aN1!@lDp*JH#GtY>Mc<4B;|9&t=G+Dl54^gEfv`QtKv`7>w
z2K2nqDhUB4MxoQAE2wKp2%Q)iE^S+4o(QAVa8x?OrXu8%5-m*x7>v>dDM6akfN3Hn
z^dx4UNXg+$G;c(lBn6tVlpd&R#Cz)9G>Erx*KZTcz`OQByubJ0<4r`&i$XhxS8*HJ
zxx9dsOF*g5wd*7h659ZusiV`UrhBK(;&x8$0r%`-HPrt`_`n$yB+U^LN!|#1=iSF2
zUNnF(%<Y|fhuBC6MNY5M3q$lZEeIsh^})jQB9|d4?1gn`_n=tW<SDNc$Uw~COH|QK
zqR3BEat8?dSitldsFD!SfL^G0U<r-!k1J5C0pT)7SyKWTC}qG4lDJh#q7Q<$-_%q2
zHN1RUZAXdZ1Lk~xm4tvs^+Fa&gQ@&`E6|d}a9JkECIkJE_z#hvk|2_QAmJjFFV80S
zqe<~n=^>GD06*`mk`U0LUdX@S1uDE_0m|zWE;BJ~N+6^3Mjs0<_i?<a-FzCqo=UId
ztVj7VQfaD4I)Dv(t0V-J+6(pV{TG!EW>&|FLf<~FhL~OvBWnL;v6rdva?(Kg;V>8e
z6vI)Z08r<nR1yMm>{V(J9U+?B8@)syE3Q%7xz;6c)2;Y9kQiH0W4HD=SHYO+v@T)2
zil8g`+|>_t?P(>{m)LH_ES#1tP=^brW#`nvn)R`O7#JkoC;Gw$(Ax-=gn;(-MBRI6
z&fLJudX>oYz=&Uo=R;MZN!zFDL_N>vJV%#8rP9kH;Q+oKrjiiQ<(|knT(il8iHEui
zCL;Z?Dt5wFRM$-{J3Hrf0vX7^dp1${xvQw05cdG~HdGY;$gX?fpwU^MKTU!+3~0f-
zF66}mPK#$8$<v3B_m1fAcXnvXdo%X^4z%#S6A^Ojog*7#gu@xereJ}QfdRRe!f8sz
zNv`t_0_}Vs%1NtIF-~S*Ux*^x4<0Br)PS&;Uq)#koyb*a#%D*?qZJYDDD9sJsCKb<
zQ!B=q$-&24flc!{oGYBqo3kk~*xZJ3Vi)A#-hgA|DD9Ii8sXTI+<-{r0p6pgj7;Z*
zq{a{-PH<I<@7e+77D9>52q-HC*E)0ZCjf@+<Un*2`4VzfYRulHtow5CzqUYdoF~Aq
z<UrAlP+a8AP@IIz&6!nWGKNFy&4b~oX9xfF^cWah7j|*v1atRkpS#G2*A2XA#d%=-
z-u(WiE<i|zF5@Sjk@E?S;5k3?oU$vx`K`qpW1MQo*f48R?Uy#Z@0|qSC9xz*B!EgA
zaJ?N4W0*EL)dm8{$JPmMUGXt%z+K^S#5J@bkh9T_3%?V)buo?w5_YJI#tjqVLW>Q!
zWGqB6bw0jr1?WF{wDvC6nBAJkQ<Toe<A4GevrJp$)rsSVtXXKmIJ-dG-_#a8b^zbW
z(DnbUf@o}mb_d95rV$=z;L%>vHsguH3-y78++BtSaDGr#gv~AI`4>}QAwyTyuUa;F
zpb$XH%FM<aEx^S9S1tm$#sVTJ;JgX$CyIjzN?ZPygd^rarE0@V;Nl$SC$<liL=%$3
zA`)`<Ypl^kE`^h3Ei}h9Rxsn;@d*Q%OfDClzoP0GzqttaF$b!0feQVq6sseV?>BwL
z-PRBaGIYZc>L%EUgUtjZ$ak85#=lM+8<t9$PMityp#O5&#1#CAZpVqDx5=84K_(JB
zUSk3j#{~*pW5UQa4igh&+zK<T!8|g2bXHYhd##Cvc(RFLB8c552eH2h1XduDD>D-d
zaW{hV>cBIThXZmy!S<Hs*xUe;`uHk*u_e$|@N}H<mp!@ooi!yS&P)*=Kq$OA@{-{8
zQ-(LT1T(5FaTUurDO7Mpd{*7ckA$jCvk32|eB9FoPr`S^jMJ^Xzvkwd4R9AMg^O&?
zge2Zd#SYMLQ0Ca(1*DUqJBPbPoN`fB$S}ugM&LjpUSR|)-wziUGaXU9J107i2H;>J
zb|%<e99G_02+<mI&OP>eA>L&O0ch>X8HoCH<QDcdUVz~vu+6E>ulw6$bC$7Yw`r*)
zc!42!+dzGAfGghxm3JyMK6vX)vY(emxCFN}gw#l~;DV%Z1GZ4hcgE)6HW|8X6(Y7`
z8L*A9z$c{Kq}52lW<PH}sIXa>vrBoAa6OJE6XY=gsgoOPEO^IH7vYZ*2u%_;HzVZ~
zuD!)6w2Gg878T*8K!(lCn6~`gc%=mV4z%PPFw|U~)A%e>@)l_>(T!Qwipw(>@vV6?
zN6mb-Y%;h`=cW+yk0z+n0NlwFNGwTia`|nI@v#<wH1p&5$(|?o73SF8ig&dG#<7G9
ziO58&C6+VM3GUVLO?`-n0&lWp+Hf1Fa|<$AycidqJN9NiY}RtYwL4cIGB`eGrWn6s
zLAy@?@1#<nv1C)Mc@K<=@f?D@CLm>E7g|{JE~FJ>BcQ|oSiv-a1PQr-H)c=sVhl6k
zZvN${_nYW6yy~P?CBfAU5I*DyWm|x7dBfFDsOGZ`J2#M!1+uO-yfH_L3-^F6?>MlB
z++T=fq7A>;iVK5)U`A)c=OIp)ZoCM^O_0Af?)Lz4!9j*@vHOQ(>{w_FQC)1qdj@y+
z@n0O7bnI&j8(#hwD>j3g1NZ&6p_!5g5p5k!{k%nU2Hac*kc<3}j_i^kT;RYs8j{Ox
z*wp!MjJwV+_~^ji55fzFGtPWFwmFyI&M9Z7V2%@R^;>BBIA^%&CsLOM<K&(iK2D|v
zQyYxaLjM!fIRrO$`cF(QV7&hm^B@E-Z1bO(pip8RwVd{thB<gx9Hc^tJ>yI+w+*pb
zI%B}DjOKeuKr_=|l3sAEj)cMpznuaR2MXWz+<uim6$l1(<2>g@44=vv7<*5hIhBha
zGzHKMlby|xP`>+$(v)m%lwe0X;{>}ni9RpsSvucUkZxL00_iX>(CzJ8NQLLDo}PzJ
zS-cmf<+EXF2C*NrIrrEgl@=*ABxi^)uXCu6Kr{F|Fsw*KgV%k>n6VlP|K<2u8c_Tm
zAxOa<-!Z1_emz_u=UcXGKPv(?yRw&#W$tPbTX~w`5u1YW=Ts29T}%P53vAggaxNvw
zs{+ipFb-@{BrgQ+{^jIt0ryR!0JPd}+Q0q17(KmX5E6GC#Z3Z_43A9}7@bHPArBkV
zayo>v7=~^r7xmKWlA&((#<bBSlK_tsaJMO7@~|j@1}~VxSn9)D1?2n1X5|M7yhXri
zzCiR=AR-SIxJ403zYoSkv;O$Ak7psMzuU}&glMgJ35t8p^}4`GQjRpOul9eOI1HF(
z!O-<N4xebvIPp&;mOX1Jn9lXpRkmg?#{tg<7`l^W8Y@zG<f$po2n~`mlf^qz9ZMFz
zD_;LCBV}jy<QGUv7XE1>cp4nXA(77$&QuM0$6_2r(BJmvd1p<8q%qn+z8n?H7JI1A
z?YZ5K_)!2uce`E~&vO_|gaUtkJzr*Gc~h94IJqr2SvejSVjpS=;9g9C4QGoMC&S*~
zGA3Gr$D8mRLU09FQDzxFHi0bV8qNCqJRWTIPT*bX{+GQr2u}L&xPni_!HK+K@WMi>
z5AP`WL<F>Yc;6w9NnoGA&`qd=JP)d=kxO9ZQ7$eEM?MK{{Sg=fn`Q5z{=6Lv?u%y8
z3EpMkF5|#V`)_#ktLj!nCcM$0*{2WhGk8;f=1Fk;7?`o*_1yRRgvEHoSYVe7;N93b
z7G{Lv;G^v27{Iv><Z(V@p$O3GL{`k~c_n$VVCxhZemW~Hd=SrZa15+n+E*)S-n`>+
zhU5Sk40WXQ1?UZ<L0SL7JZtr6PzFd^RlNx=YY2~<JQ|D?%H-ZrfU6$L<6e$poHZ)l
zsLI2`IGiE5fC7~gUZuhfjtM`{EI6MJ_BUU0w!=9llz*K|VPGPr5WioBZu|8C@YF$-
z(OqrEBY2)(e~RXal=@dGkZJvJUr)vf-s8y7)@x=$GO?C4kN?#WNDRqMH<(%%$*n7e
zC73$Y%k}pnP+J8<H=hzyaP0{AaE`mm)h1xln94mF`A<{hM{+#)X)>g|5KE6_h$R}u
z<0d6Dtu(O=r?CtgO<Zit@AtucBn`vCytzLQOgU2&35|RqPlE1T;mn~#3L|LuRUL;L
zk)!Uvn}zPg7*4LKaNG;-Cz^46jDlP_4jP>LDHT|E!wAyJHsf)GHB4ja$!xwrHH_m*
z7=pWOP48kt_c$O~It(0*9<L=qlP_}f3?ww=?16&u#8o~pXXHNo%6ZYGIw^kHW~%OY
zI`eZsuxADg-4$@*TdidL*HFe*A0D-k1&LQMjFh1kE}6&^rJj-T@mv+fm(k2@d~OKX
z_lOc4KWj<S1<=&CfdqSPl7`)aPbN*>x-}RqZ;R9Xz;cj{9frV8MVH|^UN>`rL*qV!
z;G6W-K<IJKQr+vaiwJvrTnp?R9_63nCK4#9`W1sfy*!Om&y#fjUGv#adKa=v-o9S@
z`zVM@28;lm`5OA2meGZpr4O%R_#)+#&N~GWHzGF;;5NL0fzUZBfJXh(t{F{{ATbF>
zppMjK0wWsun;j{Fz=)yK;tK1LZ)WbV2c~z;GB13pRwI&~5X~`JxP1qJrz@vvDe$QP
zt_YH&0)2Q(!y7$zI#00im<*>TF$VhZmWDqiO-;u$zX1^^wG@`bGKzNs4Kjj$GeaZ5
z5REu$D4I^Pz5lvEQc1S<Ut#Eez<0$}fn?`P66!3X$>o?K7`-<UDt;NAU?4c!A9T(X
z5q#<oUI77}-#CIFK3fow+h3@-WO5%K|Et{~ux2g{rOq@I&(U(BZWS~!xr3FZ)UY9Q
zH54@Kw^G9vXW}mjptxKh&@BggJ^1ATlJW@Q>iJqpxH19ub}C7sKhHzmBBEEtWH68P
z623Ynu3eyEYefS6&oaK7I7scAx=@3b7?LMJK=Phi2qfM5f#OPm1kdXSp#uUMy32i`
zXV271z$X2K$dP>N3+%(Pw0JbSgfoJ!&f8$aU=Wb4B`_q9hQNeSTDpK@W*?AIAdsNt
zd%4mDB-98Qp)mPgD}=lq67QJ#<N)7ov4Fo4&)8`yL>>J|XcFN!#4$3q4{w5^4sP{s
zNrq)_g~&R<a?(x7_$7kazk5S>4{XFNk~Z2$M!==Jg$-OPaAo!8mKayf2-mt0&${`b
zi`><B)|ttiWdfJ9H~2)u_<9ky1u)ZbV|Q2{@GeQt{>*QstTGcf#6p4lLyMDPWgHL;
ziQuyfnCAik+a-^Dp}OLuv0x5x)7Z)h?nXY3i;Lyr%H{VVUMV|o1&7moSB23n{LrES
z>f&UtM;E{gw`Ts|=9$ont=v><nEK^fsE@dBXWj!-c(az!XeDpO-{ZiFi!A@mpS2c8
zM}vvu5RY6M4V(C42mbpBo;mRqYr!fGYea4vA-muS6RB5RrL<kw?R_=qd)cf~-sPFl
zoQ<L?>BKgsV<rkTIv4R8PkAwBT8WVJ%X<OxEk$1J#b}RO^=VIGSWFmcPjQ;YD>-w3
z+OFU7>txnDH8W*2$Kr;(*K@_PjGsG&&a0_rL7uXj=<#Dgg(f3~$5UTt<kdBV*v)iW
z>cr9f{WHXg=2tDvuR=VcC(}mL%I0vEJ2Q*$J2fO&BZowjR&z57NSZ)P2og>od%?-z
zIknEZYy~K`-v&O619=?z=3=o4KW)>0;Bh_?P|(XSYc~Aw9>Dhpk3;(kMYBWpu*wL)
zKHJE1n)T3KT-p~^5N3a!#r5wdo&!e+wV{eS{u<XtgX6SIoj{isVCShoS3G=l!OB7L
zD>>HzO<gwuEE9wK#(?Yawn|)*R)+)Qm~FhuTj4^IB+`%P(c8(fkgKMZQ_$-@KpzhS
z))PFsC>-1aoMwJ&Ta-#Bfotnw==KY;A31sGK(3vz-8w0*z>3>?VzC{03z^$2?H*C4
zCCj-Om+A8-Wud%{j5$v3O}1lr0H#^~Z)n{Hk`LX$`$+-`4(SfY0s)QAGQhLNJF#y!
zXx=V$6Z&#e1grOC#gk9tWiWJG&5B)wBS=&GdeC?++D-hUi%O413y{HGLCbv}iRW~M
zT@#Shg7cw(d%cHa#4Wq(TCjGm*Ko2J?I0?;8)}z*grkebf@EqzR0$tp#X|0+Baqqv
z=!_81vyGySv$!k)G_}HrVDtBL%s4tkND~r=p{wpKJqlL*2v+DG5xgtq)y-Kb{<aFH
zySnoMa(1XqA2Yh61NtaAcFo|?<N=r&3rK289KmImajfX&yssA4?Jj`bd636mm@6ET
zIKgu-{v+f{Ij@!;vYqe6?=gU82(w28&pc@k7Xv_3#RZ)K>vf37I?Vn`u_M9GKg?sl
z%rfT_nA?S1v$1bDbPz`flFoh&uT|j+8~4Uh2UGVz{A`+4$G1mtav)Sk4Ye}gLY?|0
zq_sOxPSyYVQ`hJiQQ*tO;z}02xZ$i|SSK*5_*YIZ-q?w;(Bwl88jID(IfD&pTd&}!
zK+yxN%Ki0A$tJL>35ITC@HfwdewfNdh%&K_8?ih9^nEzN$;5F1@Qnqp&$xacYTkN(
zKz2FFBk%chImE@sof<RzcitF!4DpH&k)b;n!-j`!--0WLz^CkCo(kPa<+KA8nIDpe
ztKx=MRe-e-5FOn^fRm><$>`9OuV(EQIRmUY&0~*GwiV6V1ZvgoGvpjwo2BDumQKhn
zBD{fTIV^dvX2t@J=E@2s;QF8Aag|D8y+9ls39kG+j~k+d!!x>t#Zrxx7YL3fijq!A
zEJUGm)Q1ymz(I1ntUD#17jd!=BnnV#qM?1l)+`zxmxz2{P^;OjhIxZY(=Kyr@kVbU
zPexFavafLF8q(e*ks37ujM_Hx&p%1q*#h+F8db|Pp?#ydnbI&NArCeFsol+iz_71b
z5<jctG+{U}Hf7tEa3^A^2(R-53wJ<+2vdRYdcyXXSi*lJOrs_SUE`5^-C-Y|M`!79
zCNB2?&O#oE_Ko0nmK6T0MWOQ;u9^MM{^TXX+c+~KQ4?9=QQX&gW^jY&u=NnKyODNO
zfj6;lN6oC}(4qs#&mF<Ol{^xMxkK>>Bu%3{f_rp}W5ksmwZ-2_abcaMS`T-uJOq(f
zg5{lb`h=CY2}`IxJeT86IBMF#2?w>~@Evmd;;PvU2T)6HX5rutpw0F!hsGHlz-bNg
z#})W|dqCRV<B%w30Jn}DWqf}Nm8K6t$5->bE7}W(R5esBzR#<r88nL4zZy8Es$W*T
zh8!ToG)wE(JQMoZpUWT()4dfI>U^X8xA%a-x>*app@ui|a3W`9reI{Q8yI=NmN)W}
zn_#4z=8)t8!F6O0QS0Q8-~DghI7S{zc4?L$DI9fM<kF8ji_tK3EU-{7%(S2W4wxP_
zvu^G~qN1(tSG0+tHjo$EfQ`2waYR_&ma)-PhdLU_syfboO^2IGO|64KCOi5LBd;}+
zo0;nMm}5dAy}3XFlO~y$-YM9126%1&k8aT%{)Fc-i~Fi*wsZv(mp<jNIMx+vGA&@`
z)Wp5daNpLNRClBXmV<$R*QxWoNwz{*bZdq2bHd`s0yWM36AEa}HsGo$aAMX+Eknjp
zUzrgH1Z+V)rwZpQw3k+-zrN`LxM>X>4t4KI+W=DToZ!tM9!JnaUlOz%-s!@$B-doz
z1?vLp!jo6zGu9Q)b%JWLj~<8vGT#|Edo=RME6%V+07)%&A-J?A9yi=sDEee`s(LuP
zn=8b*EezeWx7n{b4wSF55p6&D)DYu01WPxA%hV7+UUURyV|gStae}g;L4ton2y*4$
z94FoY5ABG5<arCcJj72N0J-NM9_jALnCrtEM9n761upX~K?aI8h)?#wGvQyJr@Mn@
M&$7g0r!iLl2dBY95&!@I

delta 19121
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
NVWC;zQIj~!{{vP&Yi|Gm


From 5033a3d961fec7b5d1a5049a04e691a5e1e397ec Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Mon, 27 Oct 2014 13:12:59 +0100
Subject: [PATCH 074/132] Remove print.

---
 python/helpers/pydev/pydev_ipython/matplotlibtools.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python/helpers/pydev/pydev_ipython/matplotlibtools.py b/python/helpers/pydev/pydev_ipython/matplotlibtools.py
index 2b9f1e72209e..075c43781ab3 100644
--- a/python/helpers/pydev/pydev_ipython/matplotlibtools.py
+++ b/python/helpers/pydev/pydev_ipython/matplotlibtools.py
@@ -49,7 +49,6 @@ def patch_use(interpreter):
     """ Patch matplotlib function 'use' """
     matplotlib = sys.modules['matplotlib']
     def patched_use(*args, **kwargs):
-        print "patched use!"
         matplotlib.real_use(*args, **kwargs)
         gui, backend = find_gui_and_backend()
         interpreter.enableGui(gui)

From aba1adbc056257747689e3f35caf7b27a068e723 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Fri, 24 Oct 2014 16:48:54 +0400
Subject: [PATCH 075/132] check for dumb #IDEA-128914 fixed

---
 .../xml/util/documentation/HtmlDocumentationProvider.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java
index 271fd5b6ff3d..1b416f37b92d 100644
--- a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java
+++ b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java
@@ -19,6 +19,7 @@ import com.intellij.lang.Language;
 import com.intellij.lang.LanguageDocumentation;
 import com.intellij.lang.documentation.DocumentationProvider;
 import com.intellij.lang.documentation.DocumentationUtil;
+import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiManager;
@@ -273,7 +274,7 @@ public class HtmlDocumentationProvider implements DocumentationProvider {
     if (result== null && styleProvider !=null) {
       result = styleProvider.getDocumentationElementForLink(psiManager, link, context);
     }
-    if (result== null && ourScriptProvider !=null) {
+    if (result== null && ourScriptProvider != null && !DumbService.isDumb(psiManager.getProject())) {
       result = ourScriptProvider.getDocumentationElementForLink(psiManager, link,context);
     }
     return result;

From a5918f4d10fb9f3a52f6eeb1bb9069234f598ed8 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Mon, 27 Oct 2014 13:33:04 +0100
Subject: [PATCH 076/132] Project View: sort directories by type as well (e.g.
 OS X bundles .app, .framework) + readability improved

---
 .../ide/projectView/impl/nodes/PsiDirectoryNode.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiDirectoryNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiDirectoryNode.java
index ec0b9dd8b6c6..7447fa3006c5 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiDirectoryNode.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiDirectoryNode.java
@@ -321,9 +321,13 @@ public class PsiDirectoryNode extends BasePsiNode<PsiDirectory> implements Navig
   @Override
   public Comparable getTypeSortKey() {
     VirtualFile file = getVirtualFile();
-    if (file == null) return null;
-    String extension = file.getExtension();
-    return extension == null ? null : new PsiFileNode.ExtensionSortKey(extension);
+    if (file != null) {
+      String extension = file.getExtension();
+      if (extension != null) {
+        return new PsiFileNode.ExtensionSortKey(extension);
+      }
+    }
+    return null;
   }
 
   @Override

From 2679d398a1ebe8f4b0cd4e553f24e16c28ccadde Mon Sep 17 00:00:00 2001
From: "Vladimir.Orlov" <Vladimir.Orlov@jetbrains.com>
Date: Mon, 27 Oct 2014 15:39:43 +0300
Subject: [PATCH 077/132] added ability to get patches for custom-jdk-bundled
 mac installations.

---
 .../intellij/openapi/updateSettings/impl/UpdateChecker.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
index 6e879427859a..1d8fa160a1e2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
@@ -764,7 +764,11 @@ public final class UpdateChecker {
 
     String fromBuildNumber = patch.getFromBuild().asStringWithoutProductCode();
     String toBuildNumber = newVersion.getNumber().asStringWithoutProductCode();
-    String bundledJdk = "jdk-bundled".equals(System.getProperty("idea.java.redist")) ? "-jdk-bundled" : "";
+    String jdkMacRedist = System.getProperty("idea.java.redist");
+    String bundledJdk = "";
+    if (jdkMacRedist.lastIndexOf("jdk-bundled") >= 0 ){
+      bundledJdk = "jdk-bundled".equals(jdkMacRedist) ? "-jdk-bundled" : "-custom-jdk-bundled";
+    }
 
     String fileName = productCode + "-" + fromBuildNumber + "-" + toBuildNumber + "-patch" + bundledJdk + osSuffix + ".jar";
 

From 0c75cdaf419f27d8442b3df156fd06ce8cdc343e Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Mon, 27 Oct 2014 14:07:12 +0400
Subject: [PATCH 078/132] annotation added

---
 .../org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java
index 038c1c24121f..d4d40d791bed 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java
@@ -35,7 +35,7 @@ import java.util.List;
 public class HgUpdateEnvironment implements UpdateEnvironment {
 
   private final Project project;
-  private final HgUpdateConfigurationSettings updateConfiguration;
+  @NotNull private final HgUpdateConfigurationSettings updateConfiguration;
 
   public HgUpdateEnvironment(Project project) {
     this.project = project;
@@ -89,7 +89,7 @@ public class HgUpdateEnvironment implements UpdateEnvironment {
     private final HgUpdateConfigurationSettings updateConfiguration;
     protected HgUpdateDialog updateDialog;
 
-    public UpdateConfigurable(HgUpdateConfigurationSettings updateConfiguration) {
+    public UpdateConfigurable(@NotNull HgUpdateConfigurationSettings updateConfiguration) {
       this.updateConfiguration = updateConfiguration;
     }
 

From 4e3741467901fdd3cbfe5874616fd6030aed88d8 Mon Sep 17 00:00:00 2001
From: "Vassiliy.Kudryashov" <Vassiliy.Kudryashov@jetbrains.com>
Date: Mon, 27 Oct 2014 16:28:49 +0300
Subject: [PATCH 079/132] IDEA-129421 "Rerun failed tests" ignores pinned
 status of the tab

---
 .../com/intellij/execution/ui/RunContentManagerImpl.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
index c9dae095522c..b7f56a69f887 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
@@ -38,6 +38,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.project.ProjectManagerListener;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Key;
@@ -421,7 +422,11 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
       }
       //Stage two: try to get content from descriptor itself
       final Content attachedContent = descriptor.getAttachedContent();
-      if (attachedContent != null && attachedContent.isValid() && contentManager.getIndexOfContent(attachedContent) != -1) {
+
+      if (attachedContent != null
+          && attachedContent.isValid()
+          && contentManager.getIndexOfContent(attachedContent) != -1
+          && (Comparing.equal(descriptor.getDisplayName(), attachedContent.getDisplayName()) || !attachedContent.isPinned())) {
         content = attachedContent;
       }
     }

From ed706f730cc43cacaef974ff30f285c9f9484b0a Mon Sep 17 00:00:00 2001
From: Elizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Date: Mon, 27 Oct 2014 16:48:53 +0300
Subject: [PATCH 080/132] rename some files like in PyDev debugger

---
 .../pkgutil_old.py => _pydev_imps/_pydev_pkgutil_old.py}      | 0
 .../pluginbase.py => _pydev_imps/_pydev_pluginbase.py}        | 4 ++--
 .../uuid_old.py => _pydev_imps/_pydev_uuid_old.py}            | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename python/helpers/pydev/{third_party/pkgutil_old.py => _pydev_imps/_pydev_pkgutil_old.py} (100%)
 rename python/helpers/pydev/{third_party/pluginbase.py => _pydev_imps/_pydev_pluginbase.py} (99%)
 rename python/helpers/pydev/{third_party/uuid_old.py => _pydev_imps/_pydev_uuid_old.py} (100%)

diff --git a/python/helpers/pydev/third_party/pkgutil_old.py b/python/helpers/pydev/_pydev_imps/_pydev_pkgutil_old.py
similarity index 100%
rename from python/helpers/pydev/third_party/pkgutil_old.py
rename to python/helpers/pydev/_pydev_imps/_pydev_pkgutil_old.py
diff --git a/python/helpers/pydev/third_party/pluginbase.py b/python/helpers/pydev/_pydev_imps/_pydev_pluginbase.py
similarity index 99%
rename from python/helpers/pydev/third_party/pluginbase.py
rename to python/helpers/pydev/_pydev_imps/_pydev_pluginbase.py
index 18bd50524fc2..ed4203fb6f89 100644
--- a/python/helpers/pydev/third_party/pluginbase.py
+++ b/python/helpers/pydev/_pydev_imps/_pydev_pluginbase.py
@@ -16,14 +16,14 @@ from pydevd_constants import IS_PY24, IS_PY3K, IS_JYTHON
 
 
 if IS_PY24:
-    from third_party.uuid_old import uuid4
+    from _pydev_imps._pydev_uuid_old import uuid4
 else:
     from uuid import uuid4
 
 if IS_PY3K:
     import pkgutil
 else:
-    import pkgutil_old as pkgutil
+    from _pydev_imps import _pydev_pkgutil_old as pkgutil
 
 import errno
 try:
diff --git a/python/helpers/pydev/third_party/uuid_old.py b/python/helpers/pydev/_pydev_imps/_pydev_uuid_old.py
similarity index 100%
rename from python/helpers/pydev/third_party/uuid_old.py
rename to python/helpers/pydev/_pydev_imps/_pydev_uuid_old.py

From 50812e342612a422a7c08eca80fe8e4f052a5504 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Fri, 24 Oct 2014 14:39:39 +0200
Subject: [PATCH 081/132] light duplicate profile

---
 .../dupLocator/LightDuplicateProfile.java     | 30 +++++++++++++
 .../dupLocator/index/DuplicatesIndex.java     | 43 ++++++++++++-------
 2 files changed, 58 insertions(+), 15 deletions(-)
 create mode 100644 platform/duplicates-analysis/src/com/intellij/dupLocator/LightDuplicateProfile.java

diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/LightDuplicateProfile.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/LightDuplicateProfile.java
new file mode 100644
index 000000000000..9f2c2a7c7d95
--- /dev/null
+++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/LightDuplicateProfile.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.dupLocator;
+
+import com.intellij.lang.LighterASTNode;
+import com.intellij.psi.PsiFile;
+
+/**
+ * Created by Maxim.Mossienko on 10/1/2014.
+ */
+public interface LightDuplicateProfile {
+  void process(PsiFile file, Callback callback);
+
+  interface Callback {
+    void process(LighterASTNode node, int hash);
+  }
+}
diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
index 55367ae4a19d..2f7962e3d87e 100644
--- a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
+++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
@@ -18,15 +18,17 @@ package com.intellij.dupLocator.index;
 import com.intellij.dupLocator.DuplicatesProfile;
 import com.intellij.dupLocator.DuplocateVisitor;
 import com.intellij.dupLocator.DuplocatorState;
+import com.intellij.dupLocator.LightDuplicateProfile;
 import com.intellij.dupLocator.treeHash.FragmentsCollector;
 import com.intellij.dupLocator.util.PsiFragment;
 import com.intellij.lang.Language;
+import com.intellij.lang.LighterASTNode;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiFile;
 import com.intellij.util.SystemProperties;
 import com.intellij.util.indexing.*;
 import com.intellij.util.io.DataExternalizer;
@@ -52,6 +54,7 @@ import java.util.Map;
 public class DuplicatesIndex extends FileBasedIndexExtension<Integer, TIntArrayList> implements PsiDependentIndex {
   static boolean ourEnabled = SystemProperties.getBooleanProperty("idea.enable.duplicates.online.calculation",
                                                                   isEnabledByDefault());
+  static boolean ourEnabledLightProfiles = false;
 
   private static boolean isEnabledByDefault() {
     Application application = ApplicationManager.getApplication();
@@ -59,7 +62,7 @@ public class DuplicatesIndex extends FileBasedIndexExtension<Integer, TIntArrayL
   }
 
   @NonNls public static final ID<Integer, TIntArrayList> NAME = ID.create("DuplicatesIndex");
-  private static final int myBaseVersion = 10;
+  private static final int myBaseVersion = 11;
 
   private final FileBasedIndex.InputFilter myInputFilter = new FileBasedIndex.InputFilter() {
     @Override
@@ -107,21 +110,31 @@ public class DuplicatesIndex extends FileBasedIndexExtension<Integer, TIntArrayL
     @Override
     @NotNull
     public Map<Integer, TIntArrayList> map(@NotNull final FileContent inputData) {
-      return ApplicationManager.getApplication().runReadAction(new Computable<Map<Integer, TIntArrayList>>() {
-        @Override
-        public Map<Integer, TIntArrayList> compute() {
-          FileType type = inputData.getFileType();
+      FileType type = inputData.getFileType();
 
-          DuplicatesProfile profile = findDuplicatesProfile(type);
-          if (profile == null) return Collections.emptyMap();
+      DuplicatesProfile profile = findDuplicatesProfile(type);
+      if (profile == null) return Collections.emptyMap();
 
-          MyFragmentsCollector collector = new MyFragmentsCollector(profile, ((LanguageFileType)type).getLanguage());
-          DuplocateVisitor visitor = profile.createVisitor(collector, true);
-          visitor.visitNode(((FileContentImpl)inputData).getPsiFileAccountingForUnsavedDocument());
+      PsiFile psiFile = ((FileContentImpl)inputData).getPsiFileAccountingForUnsavedDocument();
 
-          return collector.getMap();
-        }
-      });
+      if (profile instanceof LightDuplicateProfile && ourEnabledLightProfiles) {
+        final THashMap<Integer, TIntArrayList> result = new THashMap<Integer, TIntArrayList>();
+        ((LightDuplicateProfile)profile).process(psiFile, new LightDuplicateProfile.Callback() {
+          @Override
+          public void process(LighterASTNode node, int hash) {
+            TIntArrayList list = result.get(hash);
+            if (list == null) { result.put(hash, list = new TIntArrayList(1)); }
+            list.add(node.getStartOffset());
+          }
+        });
+        return result;
+      }
+      MyFragmentsCollector collector = new MyFragmentsCollector(profile, ((LanguageFileType)type).getLanguage());
+      DuplocateVisitor visitor = profile.createVisitor(collector, true);
+
+      visitor.visitNode(psiFile);
+
+      return collector.getMap();
     }
   };
 
@@ -135,7 +148,7 @@ public class DuplicatesIndex extends FileBasedIndexExtension<Integer, TIntArrayL
 
   @Override
   public int getVersion() {
-    return myBaseVersion + (ourEnabled ? 0xFF : 0);
+    return myBaseVersion + (ourEnabled ? 0xFF : 0) + (ourEnabledLightProfiles ? 0x7F : 0);
   }
 
   @Override

From 0c9d14308a037f2804586f90192b66ee7309a467 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Fri, 24 Oct 2014 14:39:59 +0200
Subject: [PATCH 082/132] notnull

---
 platform/core-api/src/com/intellij/lang/LighterAST.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/core-api/src/com/intellij/lang/LighterAST.java b/platform/core-api/src/com/intellij/lang/LighterAST.java
index 71305c5937be..af01fcb7d7f1 100644
--- a/platform/core-api/src/com/intellij/lang/LighterAST.java
+++ b/platform/core-api/src/com/intellij/lang/LighterAST.java
@@ -47,7 +47,7 @@ public abstract class LighterAST {
   @NotNull
   public abstract List<LighterASTNode> getChildren(@NotNull final LighterASTNode parent);
 
-  public static @Nullable LighterAST getLighterASTFromFileAST(@NotNull FileASTNode node, @NotNull Language language) {
+  public static @NotNull LighterAST getLighterASTFromFileAST(@NotNull FileASTNode node, @NotNull Language language) {
     final IFileElementType contentType = LanguageParserDefinitions.INSTANCE.forLanguage(language).getFileNodeType();
     assert contentType instanceof ILightStubFileElementType;
 

From 92d34a326c21bda021fb5cd57b0375105075ea01 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Fri, 24 Oct 2014 14:41:29 +0200
Subject: [PATCH 083/132] IDEA-131853 Duplicate navigates to same place

---
 .../src/com/intellij/dupLocator/index/DuplicatesIndex.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
index 2f7962e3d87e..98145cda3c3b 100644
--- a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
+++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
@@ -62,7 +62,7 @@ public class DuplicatesIndex extends FileBasedIndexExtension<Integer, TIntArrayL
   }
 
   @NonNls public static final ID<Integer, TIntArrayList> NAME = ID.create("DuplicatesIndex");
-  private static final int myBaseVersion = 11;
+  private static final int myBaseVersion = 12;
 
   private final FileBasedIndex.InputFilter myInputFilter = new FileBasedIndex.InputFilter() {
     @Override

From 95a046771133aa8c8143be325c942e79e82dbb6e Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Mon, 27 Oct 2014 14:18:57 +0100
Subject: [PATCH 084/132] better api for lighter ast + caching

---
 .../intellij/lang/FCTSBackedLighterAST.java   |  2 +-
 .../src/com/intellij/lang/FileASTNode.java    |  4 +++
 .../src/com/intellij/lang/LighterAST.java     | 17 ---------
 .../intellij/psi/stubs/LightStubBuilder.java  |  2 +-
 .../psi/impl/source/tree/FileElement.java     | 36 +++++++++++++++++--
 .../source/tree/LazyParseableElement.java     |  8 +++--
 6 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/platform/core-api/src/com/intellij/lang/FCTSBackedLighterAST.java b/platform/core-api/src/com/intellij/lang/FCTSBackedLighterAST.java
index b393f8d37707..2df20519e18d 100644
--- a/platform/core-api/src/com/intellij/lang/FCTSBackedLighterAST.java
+++ b/platform/core-api/src/com/intellij/lang/FCTSBackedLighterAST.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-class FCTSBackedLighterAST extends LighterAST {
+public class FCTSBackedLighterAST extends LighterAST {
   private final FlyweightCapableTreeStructure<LighterASTNode> myTreeStructure;
 
   public FCTSBackedLighterAST(final CharTable charTable, final FlyweightCapableTreeStructure<LighterASTNode> treeStructure) {
diff --git a/platform/core-api/src/com/intellij/lang/FileASTNode.java b/platform/core-api/src/com/intellij/lang/FileASTNode.java
index 136530822a23..193e2421ebd1 100644
--- a/platform/core-api/src/com/intellij/lang/FileASTNode.java
+++ b/platform/core-api/src/com/intellij/lang/FileASTNode.java
@@ -17,6 +17,7 @@ package com.intellij.lang;
 
 import com.intellij.util.CharTable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Top-level node in AST, corresponds to PsiFile.
@@ -28,4 +29,7 @@ public interface FileASTNode extends ASTNode {
   CharTable getCharTable();
 
   boolean isParsed();
+
+  @Nullable
+  LighterAST getLighterAST();
 }
diff --git a/platform/core-api/src/com/intellij/lang/LighterAST.java b/platform/core-api/src/com/intellij/lang/LighterAST.java
index af01fcb7d7f1..de2c44aa1299 100644
--- a/platform/core-api/src/com/intellij/lang/LighterAST.java
+++ b/platform/core-api/src/com/intellij/lang/LighterAST.java
@@ -15,8 +15,6 @@
  */
 package com.intellij.lang;
 
-import com.intellij.psi.tree.IFileElementType;
-import com.intellij.psi.tree.ILightStubFileElementType;
 import com.intellij.util.CharTable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -46,19 +44,4 @@ public abstract class LighterAST {
 
   @NotNull
   public abstract List<LighterASTNode> getChildren(@NotNull final LighterASTNode parent);
-
-  public static @NotNull LighterAST getLighterASTFromFileAST(@NotNull FileASTNode node, @NotNull Language language) {
-    final IFileElementType contentType = LanguageParserDefinitions.INSTANCE.forLanguage(language).getFileNodeType();
-    assert contentType instanceof ILightStubFileElementType;
-
-    final LighterAST tree;
-    if (!node.isParsed()) {
-      final ILightStubFileElementType<?> type = (ILightStubFileElementType)contentType;
-      tree = new FCTSBackedLighterAST(node.getCharTable(), type.parseContentsLight(node));
-    }
-    else {
-      tree = new TreeBackedLighterAST(node);
-    }
-    return tree;
-  }
 }
\ No newline at end of file
diff --git a/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java b/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java
index 102288e1a9a0..e9dec24fca2c 100644
--- a/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java
+++ b/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java
@@ -47,7 +47,7 @@ public class LightStubBuilder implements StubBuilder {
       LOG.error("File is not of ILightStubFileElementType: " + contentType + ", " + file);
       return null;
     }
-    final LighterAST tree = LighterAST.getLighterASTFromFileAST(file.getNode(), language);
+    final LighterAST tree = file.getNode().getLighterAST();
     if (tree == null) return null;
 
     final StubElement rootStub = createStubForFile(file, tree);
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/FileElement.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/FileElement.java
index d3071ddbca7d..a2348eabbe97 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/FileElement.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/FileElement.java
@@ -16,16 +16,19 @@
 
 package com.intellij.psi.impl.source.tree;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.FileASTNode;
+import com.intellij.lang.*;
 import com.intellij.openapi.util.Getter;
+import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.impl.PsiManagerEx;
 import com.intellij.psi.impl.source.CharTableImpl;
 import com.intellij.psi.impl.source.PsiFileImpl;
 import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.tree.IFileElementType;
+import com.intellij.psi.tree.ILightStubFileElementType;
 import com.intellij.util.CharTable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class FileElement extends LazyParseableElement implements FileASTNode, Getter<FileElement> {
   private volatile CharTable myCharTable = new CharTableImpl();
@@ -47,6 +50,35 @@ public class FileElement extends LazyParseableElement implements FileASTNode, Ge
     return myCharTable;
   }
 
+  private static final Key<LighterAST> ourTreeKey = Key.create("lighter.key");
+
+  @Nullable
+  @Override
+  public LighterAST getLighterAST() {
+    final IFileElementType contentType = (IFileElementType)getElementType();
+    assert contentType instanceof ILightStubFileElementType;
+
+    LighterAST tree;
+    if (!isParsed()) {
+      tree = getUserData(ourTreeKey);
+      if (tree == null) {
+        final ILightStubFileElementType<?> type = (ILightStubFileElementType)contentType;
+        tree = new FCTSBackedLighterAST(getCharTable(), type.parseContentsLight(this));
+        putUserData(ourTreeKey, tree);
+      }
+    }
+    else {
+      tree = new TreeBackedLighterAST(this);
+    }
+    return tree;
+  }
+
+  @Override
+  protected void resetCachesOnParsedStateUpdate() {
+    putUserData(ourTreeKey, null);
+    super.resetCachesOnParsedStateUpdate();
+  }
+
   public FileElement(IElementType type, CharSequence text) {
     super(type, text);
   }
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
index ebc699aaf181..85a28f195282 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
@@ -181,8 +181,8 @@ public class LazyParseableElement extends CompositeElement {
         if (rawFirstChild() != null) {
           LOG.error("Reentrant parsing?");
         }
-  
-        myText = null;
+
+        resetCachesOnParsedStateUpdate();
   
         if (parsedNode == null) return;
         super.rawAddChildrenWithoutNotifications((TreeElement)parsedNode);
@@ -199,6 +199,10 @@ public class LazyParseableElement extends CompositeElement {
     }
   }
 
+  protected void resetCachesOnParsedStateUpdate() {
+    myText = null;
+  }
+
   @Override
   public void rawAddChildrenWithoutNotifications(@NotNull TreeElement first) {
     if (myText() != null) {

From 49eee8d05d4ffb064c1ee6dd0ddd813538da3260 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Mon, 27 Oct 2014 14:25:42 +0100
Subject: [PATCH 085/132] light duplicate profile, step 2

---
 .../src/com/intellij/dupLocator/LightDuplicateProfile.java     | 3 ++-
 .../src/com/intellij/dupLocator/index/DuplicatesIndex.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/LightDuplicateProfile.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/LightDuplicateProfile.java
index 9f2c2a7c7d95..c3011c11454e 100644
--- a/platform/duplicates-analysis/src/com/intellij/dupLocator/LightDuplicateProfile.java
+++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/LightDuplicateProfile.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.dupLocator;
 
+import com.intellij.lang.LighterAST;
 import com.intellij.lang.LighterASTNode;
 import com.intellij.psi.PsiFile;
 
@@ -25,6 +26,6 @@ public interface LightDuplicateProfile {
   void process(PsiFile file, Callback callback);
 
   interface Callback {
-    void process(LighterASTNode node, int hash);
+    void process(LighterAST ast, LighterASTNode node, int hash);
   }
 }
diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
index 98145cda3c3b..b3e94c465e70 100644
--- a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
+++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
@@ -22,6 +22,7 @@ import com.intellij.dupLocator.LightDuplicateProfile;
 import com.intellij.dupLocator.treeHash.FragmentsCollector;
 import com.intellij.dupLocator.util.PsiFragment;
 import com.intellij.lang.Language;
+import com.intellij.lang.LighterAST;
 import com.intellij.lang.LighterASTNode;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
@@ -121,7 +122,7 @@ public class DuplicatesIndex extends FileBasedIndexExtension<Integer, TIntArrayL
         final THashMap<Integer, TIntArrayList> result = new THashMap<Integer, TIntArrayList>();
         ((LightDuplicateProfile)profile).process(psiFile, new LightDuplicateProfile.Callback() {
           @Override
-          public void process(LighterASTNode node, int hash) {
+          public void process(LighterAST ast, LighterASTNode node, int hash) {
             TIntArrayList list = result.get(hash);
             if (list == null) { result.put(hash, list = new TIntArrayList(1)); }
             list.add(node.getStartOffset());

From 85630605e156e729efc51d8ecee56b15ffe45894 Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <Alexander.Zolotov@jetbrains.com>
Date: Mon, 27 Oct 2014 16:53:46 +0300
Subject: [PATCH 086/132] Emmet support in JSX Harmony (WEB-13885, WEB-13951)

---
 .../intellij/codeInsight/template/emmet/XmlEmmetParser.java | 6 +++++-
 .../template/emmet/generators/ZenCodingGenerator.java       | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java
index 01ddc3ca563f..57dc97700a74 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java
@@ -313,7 +313,7 @@ public class XmlEmmetParser extends EmmetParser {
     }
 
     if (token == ZenCodingTokens.DOT || token == ZenCodingTokens.SHARP) {
-      final String name = token == ZenCodingTokens.DOT ? CLASS : ID;
+      final String name = getAttributeName(token);
       advance();
       token = getToken();
       final String value = getAttributeValueByToken(token);
@@ -326,6 +326,10 @@ public class XmlEmmetParser extends EmmetParser {
     return null;
   }
 
+  protected String getAttributeName(ZenCodingToken delimiterToken) {
+    return delimiterToken == ZenCodingTokens.DOT ? CLASS : ID;
+  }
+
   @Nullable
   private List<Couple<String>> parseAttributeList() {
     final List<Couple<String>> result = new ArrayList<Couple<String>>();
diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java
index b15df8b5da2e..846eb867d844 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java
@@ -61,8 +61,8 @@ public abstract class ZenCodingGenerator {
 
   public static List<ZenCodingGenerator> getInstances() {
     List<ZenCodingGenerator> generators = new ArrayList<ZenCodingGenerator>();
-    generators.add(XmlZenCodingGeneratorImpl.INSTANCE);
     Collections.addAll(generators, EP_NAME.getExtensions());
+    generators.add(XmlZenCodingGeneratorImpl.INSTANCE);
     return generators;
   }
 

From b0ad9c3ae9c61d35cd47b8fceac7e8eeeeec0d77 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Mon, 27 Oct 2014 15:31:05 +0100
Subject: [PATCH 087/132] fix PyCharm welcome

---
 .../openapi/wm/impl/welcomeScreen/NewWelcomeScreen.java        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewWelcomeScreen.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewWelcomeScreen.java
index 2994fede233a..ff94a4d5391f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewWelcomeScreen.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewWelcomeScreen.java
@@ -28,7 +28,6 @@ import com.intellij.openapi.updateSettings.impl.UpdateChecker;
 import com.intellij.openapi.updateSettings.impl.UpdateSettings;
 import com.intellij.openapi.util.DimensionService;
 import com.intellij.openapi.util.IconLoader;
-import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.wm.WelcomeScreen;
 import com.intellij.ui.ScreenUtil;
 import com.intellij.ui.components.labels.LinkLabel;
@@ -150,7 +149,7 @@ public class NewWelcomeScreen extends JPanel implements WelcomeScreen {
   }
   
   public static boolean isNewWelcomeScreen(@NotNull AnActionEvent e) {
-    return e.getPlace() == ActionPlaces.WELCOME_SCREEN && Registry.is("ide.new.welcome.screen");
+    return e.getPlace() == ActionPlaces.WELCOME_SCREEN && FlatWelcomeFrameProvider.isAvailable();
   }
 
   private static class WelcomeScreenGroup extends DefaultActionGroup {

From 80683d965def8564ecdcf01a3d5634dda896bc55 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Mon, 27 Oct 2014 15:12:55 +0100
Subject: [PATCH 088/132] rollback fg color for inline debugger under Darcula

(cherry picked from commit fbb5649599f225c3a4812474949473a35a9499b2)
---
 platform/util/resources/misc/registry.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 7d9390c705e3..d9f47ad0209a 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -47,7 +47,7 @@ ide.debugger.inline=true
 ide.debugger.inline.description=Enables variables view in editor
 ide.debugger.inline.fg.color=134,134,134
 ide.debugger.inline.fg.color.description=Inline values foreground
-ide.debugger.inline.dark.fg.color=62,179,151
+ide.debugger.inline.dark.fg.color=61,128,101
 ide.debugger.inline.dark.fg.color.description=Inline values foreground for dark editor scheme
 ide.debugger.inline.fg.modified.color=202,128,33
 ide.debugger.inline.fg.modified.color.description=Inline modified values foreground

From a6e35cfd57a15fa66adff75643d26f9f1a15880d Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 27 Oct 2014 12:14:28 +0100
Subject: [PATCH 089/132] calculate void/value lambda compatibility based on
 valid, non-modified lambda expression

---
 .../refactoring/util/RefactoringUtil.java     | 38 +++++++++++--------
 ...utInLambdaBodyVoidValueConflict.after.java | 20 ++++++++++
 .../PutInLambdaBodyVoidValueConflict.java     | 17 +++++++++
 .../refactoring/IntroduceVariableTest.java    |  4 ++
 4 files changed, 63 insertions(+), 16 deletions(-)
 create mode 100644 java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.after.java
 create mode 100644 java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.java

diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
index 004599135fee..d181d3c49351 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
@@ -870,32 +870,38 @@ public class RefactoringUtil {
       JavaCodeStyleManager.getInstance(declaration.getProject()).shortenClassReferences(declaration);
       if (loopBodyCopy != null) codeBlock.add(loopBodyCopy);
     } else if (container instanceof PsiLambdaExpression) {
-      final PsiLambdaExpression lambdaExpression = (PsiLambdaExpression)container;
-      final PsiElement lambdaExpressionBody = lambdaExpression.getBody();
-      LOG.assertTrue(lambdaExpressionBody != null);
+      PsiLambdaExpression lambdaExpression = (PsiLambdaExpression)container;
+      final PsiElement invalidBody = lambdaExpression.getBody();
+      if (invalidBody == null) return declaration;
 
       final PsiLambdaExpression expressionFromText = (PsiLambdaExpression)elementFactory
-        .createExpressionFromText(lambdaExpression.getParameterList().getText() + " -> {}", lambdaExpression);
+        .createExpressionFromText(lambdaExpression.getParameterList().getText() + " -> {}", lambdaExpression.getParent());
       PsiCodeBlock newBody = (PsiCodeBlock)expressionFromText.getBody();
       LOG.assertTrue(newBody != null);
       newBody.add(declaration);
 
-      PsiStatement lastBodyStatement = elementFactory.createStatementFromText("a;", lambdaExpression);
-      ((PsiExpressionStatement)lastBodyStatement).getExpression().replace(lambdaExpressionBody);
+      lambdaExpression =
+        (PsiLambdaExpression)lambdaExpression.replace(elementFactory.createExpressionFromText(
+          lambdaExpression.getParameterList().getText() + " -> " + invalidBody.getText(), lambdaExpression));
+
+      final PsiElement lambdaExpressionBody = lambdaExpression.getBody();
+      LOG.assertTrue(lambdaExpressionBody != null);
+      final PsiStatement lastBodyStatement;
+      if (LambdaUtil.getFunctionalInterfaceReturnType(lambdaExpression) == PsiType.VOID) {
+        lastBodyStatement = elementFactory.createStatementFromText("a;", lambdaExpression);
+        ((PsiExpressionStatement)lastBodyStatement).getExpression().replace(lambdaExpressionBody);
+      }
+      else {
+        lastBodyStatement = elementFactory.createStatementFromText("return a;", lambdaExpression);
+        final PsiExpression returnValue = ((PsiReturnStatement)lastBodyStatement).getReturnValue();
+        LOG.assertTrue(returnValue != null);
+        returnValue.replace(lambdaExpressionBody);
+      }
       newBody.add(lastBodyStatement);
 
-      PsiLambdaExpression copy = (PsiLambdaExpression)lambdaExpression.replace(expressionFromText);
+      final PsiLambdaExpression copy = (PsiLambdaExpression)lambdaExpression.replace(expressionFromText);
       newBody = (PsiCodeBlock)copy.getBody();
       LOG.assertTrue(newBody != null);
-
-      if (LambdaUtil.getFunctionalInterfaceReturnType(copy) != PsiType.VOID) {
-        PsiExpressionStatement lastStatement = (PsiExpressionStatement)newBody.getStatements()[1];
-        PsiReturnStatement returnStatement = (PsiReturnStatement)elementFactory.createStatementFromText("return a;", copy);
-        final PsiExpression returnValue = returnStatement.getReturnValue();
-        LOG.assertTrue(returnValue != null);
-        returnValue.replace(lastStatement.getExpression());
-        lastStatement.replace(returnStatement);
-      }
       declaration = newBody.getStatements()[0];
       declaration = (PsiStatement)JavaCodeStyleManager.getInstance(declaration.getProject()).shortenClassReferences(declaration);
     }
diff --git a/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.after.java b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.after.java
new file mode 100644
index 000000000000..6315c2590032
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.after.java
@@ -0,0 +1,20 @@
+class Foo {
+    interface I<T> {
+        T m(Object op);
+    }
+
+    interface J<T> {
+        void m(T o);
+    }
+
+
+    void f(J r) {}
+    void f(I<String> r) {}
+
+    {
+        f((a) -> {
+            int c = 1;
+            return c;
+        });
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.java b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.java
new file mode 100644
index 000000000000..bdea215a08a4
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.java
@@ -0,0 +1,17 @@
+class Foo {
+    interface I<T> {
+        T m(Object op);
+    }
+
+    interface J<T> {
+        void m(T o);
+    }
+
+
+    void f(J r) {}
+    void f(I<String> r) {}
+
+    {
+        f((a) -> <selection>1</selection>);
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
index 29f792330bbf..2e2a6cc488a3 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
@@ -441,6 +441,10 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase {
     doTest(new MockIntroduceVariableHandler("c", false, false, false, "int"));
   }
 
+  public void testPutInLambdaBodyVoidValueConflict() {
+    doTest(new MockIntroduceVariableHandler("c", false, false, false, "int"));
+  }
+
   public void testNormalizeDeclarations() {
     doTest(new MockIntroduceVariableHandler("i3", false, false, false, "int"));
   }

From e473a2ed4d2cec4fb387ba749caaeac41fffa899 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 27 Oct 2014 13:26:33 +0100
Subject: [PATCH 090/132] missed writable checks

---
 .../codeInspection/AnonymousCanBeLambdaInspection.java       | 2 ++
 .../AnonymousCanBeMethodReferenceInspection.java             | 2 ++
 .../codeInspection/ExplicitTypeCanBeDiamondInspection.java   | 5 ++++-
 .../codeInspection/LambdaCanBeMethodReferenceInspection.java | 2 ++
 .../PossibleHeapPollutionVarargsInspection.java              | 2 ++
 .../codeInspection/RedundantLambdaCodeBlockInspection.java   | 2 ++
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java
index 39098b51d8f8..88df46359853 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java
@@ -17,6 +17,7 @@ package com.intellij.codeInspection;
 
 import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.ChangeContextUtil;
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil;
 import com.intellij.codeInsight.intention.HighPriorityAction;
@@ -208,6 +209,7 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaBatchLocalInspection
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
       final PsiElement element = descriptor.getPsiElement();
       if (element instanceof PsiNewExpression) {
+        if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
         final PsiAnonymousClass anonymousClass = ((PsiNewExpression)element).getAnonymousClass();
         
         LOG.assertTrue(anonymousClass != null);
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java
index 2f9f4f883648..fb3c6183889f 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInspection;
 
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -115,6 +116,7 @@ public class AnonymousCanBeMethodReferenceInspection extends BaseJavaBatchLocalI
       public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
         final PsiElement element = descriptor.getPsiElement();
         if (element instanceof PsiNewExpression) {
+          if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
           final PsiAnonymousClass anonymousClass = ((PsiNewExpression)element).getAnonymousClass();
           if (anonymousClass == null) return;
           final PsiMethod[] methods = anonymousClass.getMethods();
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/ExplicitTypeCanBeDiamondInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/ExplicitTypeCanBeDiamondInspection.java
index 08bb3413f313..b39171e76b89 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/ExplicitTypeCanBeDiamondInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/ExplicitTypeCanBeDiamondInspection.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInspection;
 
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInsight.intention.HighPriorityAction;
 import com.intellij.openapi.diagnostic.Logger;
@@ -94,7 +95,9 @@ public class ExplicitTypeCanBeDiamondInspection extends BaseJavaBatchLocalInspec
 
     @Override
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
-      PsiDiamondTypeUtil.replaceExplicitWithDiamond(descriptor.getPsiElement());
+      final PsiElement element = descriptor.getPsiElement();
+      if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
+      PsiDiamondTypeUtil.replaceExplicitWithDiamond(element);
     }
   }
 }
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
index b8c3908d392c..8b9d7f76917e 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInspection;
 
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -390,6 +391,7 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
     @Override
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
       final PsiElement element = descriptor.getPsiElement();
+      if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
       final PsiLambdaExpression lambdaExpression = PsiTreeUtil.getParentOfType(element, PsiLambdaExpression.class);
       if (lambdaExpression == null) return;
       final PsiType functionalInterfaceType = lambdaExpression.getFunctionalInterfaceType();
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/PossibleHeapPollutionVarargsInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/PossibleHeapPollutionVarargsInspection.java
index d4812f0bced7..d464e9cc45a4 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/PossibleHeapPollutionVarargsInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/PossibleHeapPollutionVarargsInspection.java
@@ -16,6 +16,7 @@
 package com.intellij.codeInspection;
 
 import com.intellij.codeInsight.AnnotationUtil;
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil;
 import com.intellij.codeInsight.intention.AddAnnotationPsiFix;
@@ -133,6 +134,7 @@ public class PossibleHeapPollutionVarargsInspection extends BaseJavaBatchLocalIn
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
       final PsiElement psiElement = descriptor.getPsiElement();
       if (psiElement instanceof PsiIdentifier) {
+        if (!FileModificationService.getInstance().preparePsiElementForWrite(psiElement)) return;
         final PsiMethod psiMethod = (PsiMethod)psiElement.getParent();
         psiMethod.getModifierList().setModifierProperty(PsiModifier.FINAL, true);
         new AddAnnotationPsiFix("java.lang.SafeVarargs", psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor);
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java
index 7a96ab1cc8bc..38bd06bba509 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInspection;
 
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInsight.intention.HighPriorityAction;
 import com.intellij.openapi.diagnostic.Logger;
@@ -158,6 +159,7 @@ public class RedundantLambdaCodeBlockInspection extends BaseJavaBatchLocalInspec
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
       final PsiElement element = descriptor.getPsiElement();
       if (element != null) {
+        if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
         final PsiLambdaExpression lambdaExpression = PsiTreeUtil.getParentOfType(element, PsiLambdaExpression.class);
         if (lambdaExpression != null) {
           final PsiElement body = lambdaExpression.getBody();

From f2257025fad4526761a6541c07f7fab11e8f0f3a Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 27 Oct 2014 15:29:10 +0100
Subject: [PATCH 091/132] extract light method object: create class initializer
 if there is no place to put initializer (IDEA-131912)

---
 .../ExtractLightMethodObjectHandler.java      | 24 +++++++--
 .../OnClosingBrace.java                       | 10 ++++
 .../OnClosingBraceLocalClass.java             | 12 +++++
 .../OnEmptyMethod.java                        |  7 +++
 .../OnFieldInitialization.java                |  7 +++
 .../OnSuperConstructorCall.java               |  9 ++++
 .../ExtractMethodObject4DebuggerTest.java     | 50 +++++++++++++++++++
 7 files changed, 115 insertions(+), 4 deletions(-)
 create mode 100644 java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBrace.java
 create mode 100644 java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBraceLocalClass.java
 create mode 100644 java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnEmptyMethod.java
 create mode 100644 java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnFieldInitialization.java
 create mode 100644 java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnSuperConstructorCall.java

diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractLightMethodObjectHandler.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractLightMethodObjectHandler.java
index 968b537bb71d..c008f7f7a609 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractLightMethodObjectHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractLightMethodObjectHandler.java
@@ -92,12 +92,28 @@ public class ExtractLightMethodObjectHandler {
     final TextRange range = originalContext.getTextRange();
     final PsiElement originalAnchor =
       CodeInsightUtil.findElementInRange(copy, range.getStartOffset(), range.getEndOffset(), originalContext.getClass());
-    //todo before this or super, not found etc
-    final PsiElement anchor = RefactoringUtil.getParentStatement(originalAnchor, false);
-    if (anchor == null) {
+
+    final PsiClass containingClass = PsiTreeUtil.getParentOfType(originalAnchor, PsiClass.class);
+    if (containingClass == null) {
       return null;
     }
-    final PsiElement container = anchor.getParent();
+
+    PsiElement anchor = RefactoringUtil.getParentStatement(originalAnchor, false);
+    if (anchor == null) {
+      if (PsiTreeUtil.getParentOfType(originalAnchor, PsiCodeBlock.class) != null) {
+        anchor = originalAnchor;
+      }
+    }
+
+    final PsiElement container;
+    if (anchor == null) {
+      container = ((PsiClassInitializer)containingClass.add(elementFactory.createClassInitializer())).getBody();
+      anchor = container.getLastChild();
+    }
+    else {
+      container = anchor.getParent();
+    }
+
     final PsiElement firstElementCopy = container.addRangeBefore(elements[0], elements[elements.length - 1], anchor);
     final PsiElement[] elementsCopy = CodeInsightUtil.findStatementsInRange(copy,
                                                                             firstElementCopy.getTextRange().getStartOffset(),
diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBrace.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBrace.java
new file mode 100644
index 000000000000..48a25567d205
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBrace.java
@@ -0,0 +1,10 @@
+class Sample {
+
+  void a() {
+    System.out.println("");
+  <caret>}
+
+  private int foo() {
+    return 1;
+  }
+}
diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBraceLocalClass.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBraceLocalClass.java
new file mode 100644
index 000000000000..010af145aaca
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBraceLocalClass.java
@@ -0,0 +1,12 @@
+class Sample {
+
+  void a() {
+      class Local {
+
+      <caret>}
+  }
+
+  private int foo() {
+    return 1;
+  }
+}
diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnEmptyMethod.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnEmptyMethod.java
new file mode 100644
index 000000000000..6436369d9d84
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnEmptyMethod.java
@@ -0,0 +1,7 @@
+class Sample {
+  static {<caret>}
+
+  int foo() {
+    return 1;
+  }
+}
diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnFieldInitialization.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnFieldInitialization.java
new file mode 100644
index 000000000000..e1746e57ed23
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnFieldInitialization.java
@@ -0,0 +1,7 @@
+class Sample {
+  int <caret>i = 0;
+
+  int foo() {
+    return 1;
+  }
+}
diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnSuperConstructorCall.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnSuperConstructorCall.java
new file mode 100644
index 000000000000..69d6f91a4643
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnSuperConstructorCall.java
@@ -0,0 +1,9 @@
+class Sample {
+  public Sample() {
+    <caret>super();
+  }
+
+  int foo() {
+    return 1;
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java
index af1fee9363dc..d6440fd5de19 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java
@@ -214,6 +214,56 @@ public class ExtractMethodObject4DebuggerTest extends LightRefactoringTestCase {
            "    }", false);
   }
 
+  public void testOnClosingBrace() throws Exception {
+    doTest("   foo()", "int result = new Test().invoke();",
+
+           "public class Test {\n" +
+           "        public int invoke() {\n" +
+           "            return foo();\n" +
+           "        }\n" +
+           "    }");
+  }
+
+  public void testOnClosingBraceLocalClass() throws Exception {
+    doTest("   foo()", "int result = new Test().invoke();",
+
+           "public class Test {\n" +
+           "        public int invoke() {\n" +
+           "            return foo();\n" +
+           "        }\n" +
+           "    }");
+  }
+
+  public void testOnFieldInitialization() throws Exception {
+    doTest("   foo()", "int result = new Test().invoke();",
+
+           "public class Test {\n" +
+           "        public int invoke() {\n" +
+           "            return foo();\n" +
+           "        }\n" +
+           "    }");
+  }
+
+  public void testOnEmptyMethod() throws Exception {
+    doTest("   foo()", "int result = Test.invoke();",
+
+           "public static class Test {\n" +
+           "        public static int invoke() {\n" +
+           "            return foo();\n" +
+           "        }\n" +
+           "    }");
+  }
+
+  public void testOnSuperConstructorCall() throws Exception {
+    doTest("   foo()", "int result = new Test().invoke();",
+
+           "public class Test {\n" +
+           "        public int invoke() {\n" +
+           "            return foo();\n" +
+           "        }\n" +
+           "    }");
+  }
+
   @Override
   protected Sdk getProjectJDK() {
     return IdeaTestUtil.getMockJdk18();

From be71edcb676ebe4151aeeee71c6fc5cbedd090ba Mon Sep 17 00:00:00 2001
From: Elizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Date: Mon, 27 Oct 2014 17:40:20 +0300
Subject: [PATCH 092/132] use info about breakpoint's function for debugger
 performance improvement

---
 .../debugger/pydev/MultiProcessDebugger.java  |  7 ++++
 .../debugger/pydev/ProcessDebugger.java       |  2 ++
 .../python/debugger/pydev/RemoteDebugger.java | 10 ++++++
 .../python/debugger/PyDebugProcess.java       | 36 +++++++++++++++++--
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
index d54bac8de85f..834916b0cf2b 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
@@ -359,6 +359,13 @@ public class MultiProcessDebugger implements ProcessDebugger {
     }
   }
 
+  @Override
+  public void setBreakpointWithFuncName(String typeId, String file, int line, String condition, String logExpression, String funcName) {
+    for (ProcessDebugger d : allDebuggers()) {
+      d.setBreakpointWithFuncName(typeId, file, line, condition, logExpression, funcName);
+    }
+  }
+
   @Override
   public void removeBreakpoint(String typeId, String file, int line) {
     for (ProcessDebugger d : allDebuggers()) {
diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/ProcessDebugger.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/ProcessDebugger.java
index 0fa5a5c21931..22344434252b 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/ProcessDebugger.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/ProcessDebugger.java
@@ -78,6 +78,8 @@ public interface ProcessDebugger {
 
   void setBreakpoint(String typeId, String file, int line, String condition, String logExpression);
 
+  void setBreakpointWithFuncName(String typeId, String file, int line, String condition, String logExpression, String funcName);
+
   void removeBreakpoint(String typeId, String file, int line);
 
   void addCloseListener(RemoteDebuggerCloseListener remoteDebuggerCloseListener);
diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
index 4ce7bdf67434..2d97a3fb1a7e 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
@@ -436,6 +436,16 @@ public class RemoteDebugger implements ProcessDebugger {
     execute(command);
   }
 
+  @Override
+  public void setBreakpointWithFuncName(String typeId, String file, int line, String condition, String logExpression, String funcName) {
+    final SetBreakpointCommand command =
+      new SetBreakpointCommand(this, typeId, file, line,
+                               condition,
+                               logExpression,
+                               funcName);
+    execute(command);
+  }
+
   @Override
   public void removeBreakpoint(String typeId, String file, int line) {
     final RemoveBreakpointCommand command =
diff --git a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
index dbeb5dedfd7c..532e374d5c74 100644
--- a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
+++ b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
@@ -24,6 +24,7 @@ import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.execution.ui.ExecutionConsole;
 import com.intellij.openapi.application.ApplicationInfo;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
@@ -34,6 +35,9 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.remote.RemoteProcessHandlerBase;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.xdebugger.*;
@@ -44,9 +48,11 @@ import com.intellij.xdebugger.breakpoints.XLineBreakpoint;
 import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
 import com.intellij.xdebugger.frame.XValueChildrenList;
 import com.intellij.xdebugger.stepping.XSmartStepIntoHandler;
+import com.jetbrains.python.PythonFileType;
 import com.jetbrains.python.console.PythonDebugLanguageConsoleView;
 import com.jetbrains.python.console.pydev.PydevCompletionVariant;
 import com.jetbrains.python.debugger.pydev.*;
+import com.jetbrains.python.psi.PyFunction;
 import com.jetbrains.python.run.PythonProcessHandler;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -594,12 +600,36 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr
     return frame;
   }
 
+  private String getFunctionName(final XLineBreakpoint breakpoint) {
+    final VirtualFile file = breakpoint.getSourcePosition().getFile();
+    final Document document = FileDocumentManager.getInstance().getDocument(file);
+    final Project project = getSession().getProject();
+    final String[] funcName = new String[1];
+    if (document != null) {
+      if (file.getFileType() == PythonFileType.INSTANCE) {
+        ApplicationManager.getApplication().runReadAction(new Runnable() {
+          @Override
+          public void run() {
+            PsiElement psiElement = XDebuggerUtil.getInstance().findContextElement(file, breakpoint.getSourcePosition().getOffset(),
+                                                                                   project, false);
+            PyFunction function = PsiTreeUtil.getParentOfType(psiElement, PyFunction.class);
+            if (function != null) {
+              funcName[0] = function.getName();
+            }
+          }
+        });
+      }
+    }
+    return funcName[0];
+  }
+
   public void addBreakpoint(final PySourcePosition position, final XLineBreakpoint breakpoint) {
     myRegisteredBreakpoints.put(position, breakpoint);
     if (isConnected()) {
-      myDebugger.setBreakpoint(breakpoint.getType().getId(), position.getFile(), position.getLine(),
-                               breakpoint.getCondition(),
-                               breakpoint.getLogExpression());
+      myDebugger.setBreakpointWithFuncName(breakpoint.getType().getId(), position.getFile(), position.getLine(),
+                                           breakpoint.getCondition(),
+                                           breakpoint.getLogExpression(),
+                                           getFunctionName(breakpoint));
     }
   }
 

From edac86f88df9d60c792a675fb7db1de56d228bd4 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Mon, 27 Oct 2014 17:40:17 +0300
Subject: [PATCH 093/132] IDEA-123797 It is impossible to edit watch item (set
 bounds equally)

---
 .../xdebugger/impl/ui/tree/TreeInplaceEditor.java   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java
index 84e391b21a1a..1edfa484421a 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java
@@ -89,6 +89,10 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
 
   protected abstract Project getProject();
 
+  private static void setInplaceEditorBounds(JComponent component, int x, int y, int width, int height) {
+    component.setBounds(x, y, width, Math.max(height, component.getPreferredSize().height));
+  }
+
   public final void show() {
     LOG.assertTrue(myInplaceEditorComponent == null, "editor is not released");
     final JTree tree = getTree();
@@ -108,12 +112,7 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
     final JComponent inplaceEditorComponent = createInplaceEditorComponent();
     myInplaceEditorComponent = inplaceEditorComponent;
     LOG.assertTrue(inplaceEditorComponent != null);
-    inplaceEditorComponent.setBounds(
-      layeredPanePoint.x,
-      layeredPanePoint.y,
-      bounds.width,
-      Math.max(bounds.height, inplaceEditorComponent.getPreferredSize().height)
-    );
+    setInplaceEditorBounds(inplaceEditorComponent, layeredPanePoint.x, layeredPanePoint.y, bounds.width, bounds.height);
 
     layeredPane.add(inplaceEditorComponent, new Integer(250));
 
@@ -145,7 +144,7 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
               return;
             }
             Point layeredPanePoint = SwingUtilities.convertPoint(tree, bounds.x, bounds.y, layeredPane);
-            inplaceEditorComponent.setBounds(layeredPanePoint.x, layeredPanePoint.y, bounds.width, bounds.height);
+            setInplaceEditorBounds(inplaceEditorComponent, layeredPanePoint.x, layeredPanePoint.y, bounds.width, bounds.height);
             inplaceEditorComponent.revalidate();
           }
         });

From e4406b74b20a7333d920cca2334806f9854b064c Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 27 Oct 2014 15:43:29 +0100
Subject: [PATCH 094/132] cleanup

---
 .../updateSettings/impl/UpdateChecker.java    | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
index 1d8fa160a1e2..14366fc46aa7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
@@ -93,7 +93,7 @@ public final class UpdateChecker {
   @NonNls private static final String DISABLED_UPDATE = "disabled_update.txt";
 
   private static Set<String> ourDisabledToUpdatePlugins;
-  private static Map<String, String> ourAdditionalRequestOptions = new HashMap<String, String>();
+  private static final Map<String, String> ourAdditionalRequestOptions = new HashMap<String, String>();
 
   private static class Holder {
     private static final String UPDATE_URL = ApplicationInfoEx.getInstanceEx().getUpdateUrls().getCheckingUrl();
@@ -464,8 +464,7 @@ public final class UpdateChecker {
   private static CheckForUpdateResult checkForUpdates(final UpdateSettings settings) {
     UpdatesInfo info;
     try {
-      UpdatesXmlLoader loader = new UpdatesXmlLoader(getUpdateUrl());
-      info = loader.loadUpdatesInfo();
+      info = UpdatesXmlLoader.loadUpdatesInfo(getUpdateUrl());
       if (info == null) {
         return new CheckForUpdateResult(UpdateStrategy.State.NOTHING_LOADED);
       }
@@ -660,14 +659,12 @@ public final class UpdateChecker {
         return uid;
       }
     }
-    String uid;
-    if (!propertiesComponent.isValueSet(INSTALLATION_UID)) {
+
+    String uid = propertiesComponent.getValue(INSTALLATION_UID);
+    if (uid == null) {
       uid = generateUUID();
       propertiesComponent.setValue(INSTALLATION_UID, uid);
     }
-    else {
-      uid = propertiesComponent.getValue(INSTALLATION_UID);
-    }
     return uid;
   }
 
@@ -683,11 +680,8 @@ public final class UpdateChecker {
             return FileUtil.loadFile(permanentIdFile).trim();
           }
 
-          String uuid;
-          if (propertiesComponent.isValueSet(INSTALLATION_UID)) {
-            uuid = propertiesComponent.getValue(INSTALLATION_UID);
-          }
-          else {
+          String uuid = propertiesComponent.getValue(INSTALLATION_UID);
+          if (uuid == null) {
             uuid = generateUUID();
           }
           FileUtil.writeToFile(permanentIdFile, uuid);
@@ -816,7 +810,7 @@ public final class UpdateChecker {
       out.close();
     }
 
-    String patchFileName = ("jetbrains.patch.jar." + platform).toLowerCase();
+    String patchFileName = ("jetbrains.patch.jar." + platform).toLowerCase(Locale.ENGLISH);
     File patchFile = new File(FileUtil.getTempDirectory(), patchFileName);
     FileUtil.copy(tempFile, patchFile);
     FileUtil.delete(tempFile);

From e2985c097d48ed463b7cf4cb4ee6ccf0a68cc31e Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 27 Oct 2014 15:44:22 +0100
Subject: [PATCH 095/132] IDEA-131621 IDEA 139.144.2 takes forever to start.
 Hangs on 100% splash screen state

---
 .../updateSettings/impl/UpdatesXmlLoader.java | 95 ++++++-------------
 1 file changed, 28 insertions(+), 67 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
index 9c6c6a2020e5..f8f9a71c120c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,33 +25,19 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.net.HttpConfigurable;
 import org.jdom.JDOMException;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-public class UpdatesXmlLoader {
-
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.updateSettings.impl.UpdatesXmlLoader");
-
-  private final String updateUrl;
-
-  public UpdatesXmlLoader(final String updatesUrl) {
-    this.updateUrl = updatesUrl;
-  }
+import java.util.concurrent.*;
 
+class UpdatesXmlLoader {
+  private static final Logger LOG = Logger.getInstance(UpdatesXmlLoader.class);
 
   @Nullable
-  public UpdatesInfo loadUpdatesInfo() throws ConnectionException{
-    LOG.debug("load update xml (UPDATE_URL='" + updateUrl + "' )");
+  public static UpdatesInfo loadUpdatesInfo(@Nullable final String updateUrl) throws ConnectionException {
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("load update xml (UPDATE_URL='" + updateUrl + "' )");
+    }
 
     if (StringUtil.isEmpty(updateUrl)) {
       LOG.debug("update url is empty: updates will not be checked");
@@ -59,20 +45,13 @@ public class UpdatesXmlLoader {
     }
 
     final Ref<Exception> error = new Ref<Exception>();
-    FutureTask<UpdatesInfo> ft = new FutureTask<UpdatesInfo>(new Callable<UpdatesInfo>() {
+    Future<UpdatesInfo> future = ApplicationManager.getApplication().executeOnPooledThread(new Callable<UpdatesInfo>() {
       @Nullable
       @Override
       public UpdatesInfo call() throws Exception {
         try {
-          prepareUrl(updateUrl);
-
-          URL requestUrl = prepareRequestUrl(updateUrl);
-
-          URLConnection connection = requestUrl.openConnection();
-          connection.setConnectTimeout(HttpConfigurable.CONNECTION_TIMEOUT);
-          connection.setReadTimeout(HttpConfigurable.CONNECTION_TIMEOUT);
-          final InputStream inputStream = connection.getInputStream();
-          Reader reader = new InputStreamReader(inputStream);
+          String url = updateUrl.startsWith("file:") ? updateUrl : updateUrl + '?' + UpdateChecker.prepareUpdateCheckArgs();
+          InputStream inputStream = HttpConfigurable.getInstance().openConnection(url).getInputStream();
           try {
             return new UpdatesInfo(JDOMUtil.loadDocument(inputStream).getRootElement());
           }
@@ -80,59 +59,41 @@ public class UpdatesXmlLoader {
             LOG.info(e); // Broken xml downloaded. Don't bother telling user.
           }
           finally {
-            reader.close();
             inputStream.close();
           }
         }
         catch (Exception e) {
+          LOG.debug(e);
           error.set(e);
         }
         return null;
       }
     });
-    ApplicationManager.getApplication().executeOnPooledThread(ft);
+
+    UpdatesInfo result = null;
     try {
-      UpdatesInfo result = ft.get(5, TimeUnit.SECONDS);
-      if (!error.isNull()) {
-        //noinspection ThrowableResultOfMethodCallIgnored
-        throw new ConnectionException(error.get());
-      }
-      return result;
+      result = future.get(5, TimeUnit.SECONDS);
     }
-    catch (TimeoutException e) {
-      // ignore
+    catch (TimeoutException ignored) {
     }
-    catch (Exception e) {
+    catch (InterruptedException e) {
       LOG.debug(e);
-      throw new ConnectionException(e.getMessage(),e);
+      error.set(e);
     }
-    if (!ft.isDone()) {
-      ft.cancel(true);
-      throw new ConnectionException(IdeBundle.message("updates.timeout.error"));
+    catch (ExecutionException e) {
+      LOG.debug(e);
+      error.set(e);
     }
-    return null;
 
-  }
-
-
-  protected static void prepareUrl(@NotNull String url) throws ConnectionException {
-    try {
-      HttpConfigurable.getInstance().prepareURL(url);
-    }
-    catch (Exception e) {
-      throw new ConnectionException(e);
-    }
-  }
-
-  protected URL prepareRequestUrl(@NotNull String url) throws ConnectionException {
-    try {
-      if (url.startsWith("file:")) {
-        return new URL(url);
+    if (!future.isDone()) {
+      future.cancel(true);
+      if (error.isNull()) {
+        throw new ConnectionException(IdeBundle.message("updates.timeout.error"));
       }
-      return new URL(url + "?" + UpdateChecker.prepareUpdateCheckArgs());
     }
-    catch (Exception e) {
-      throw new ConnectionException(e);
+    if (!error.isNull()) {
+      throw new ConnectionException(error.get());
     }
+    return result;
   }
 }

From a06c75a1633e443ef188ce58397b63786689c7bf Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 27 Oct 2014 15:47:16 +0100
Subject: [PATCH 096/132] cleanup

---
 .../impl/pluginsAdvertisement/PluginsAdvertiser.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java
index 4ae3caee88e1..b08adda9d2f9 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java
@@ -245,6 +245,7 @@ public class PluginsAdvertiser implements StartupActivity {
     final KnownExtensions extensions = loadExtensions();
     if (extensions != null && unknownFeatures.isEmpty()) return;
     final Runnable runnable = new Runnable() {
+      @Override
       public void run() {
         final Application application = ApplicationManager.getApplication();
         if (application.isUnitTestMode() || application.isHeadlessEnvironment()) return;
@@ -252,9 +253,10 @@ public class PluginsAdvertiser implements StartupActivity {
           private final Set<PluginDownloader> myPlugins = new HashSet<PluginDownloader>();
           private List<IdeaPluginDescriptor> myAllPlugins;
 
-          private Map<Plugin, IdeaPluginDescriptor> myDisabledPlugins = new HashMap<Plugin, IdeaPluginDescriptor>();
+          private final Map<Plugin, IdeaPluginDescriptor> myDisabledPlugins = new HashMap<Plugin, IdeaPluginDescriptor>();
           private List<String> myBundledPlugin;
 
+          @Override
           public void run() {
             try {
               myAllPlugins = RepositoryHelper.loadPluginsFromRepository(null);
@@ -349,6 +351,7 @@ public class PluginsAdvertiser implements StartupActivity {
     @MapAnnotation(surroundWithTag = false, surroundKeyWithTag = false, surroundValueWithTag = false)
     public Map<String, PluginSet> myExtensions = new HashMap<String, PluginSet>();
 
+    @SuppressWarnings("unused")
     public KnownExtensions() {
     }
 
@@ -371,6 +374,7 @@ public class PluginsAdvertiser implements StartupActivity {
   public static class PluginSet {
     public Set<Plugin> myPlugins = new HashSet<Plugin>();
 
+    @SuppressWarnings("unused")
     public PluginSet() {
     }
 

From 9d8b6d25218d6e7f4356fe1bd97b8d5d65bd3777 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 27 Oct 2014 16:09:34 +0100
Subject: [PATCH 097/132] cleanup

---
 .../openapi/updateSettings/impl/Product.java   | 18 +++++++++---------
 .../updateSettings/impl/UpdateChannel.java     | 13 ++++++-------
 .../updateSettings/impl/UpdatesInfo.java       | 10 ++++------
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/Product.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/Product.java
index 56ae855dc317..2a576abf538a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/Product.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/Product.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,19 +33,17 @@ public class Product {
   private final Set<String> myCodes;
   private final List<UpdateChannel> myChannels;
 
-  public Product(Element node) {
+  public Product(@NotNull Element node) {
     myName = node.getAttributeValue("name");
     myCodes = new LinkedHashSet<String>();
     myChannels = new ArrayList<UpdateChannel>();
 
-    List codes = node.getChildren("code");
-    for (Object code : codes) {
-      myCodes.add(((Element)code).getValue());
+    for (Element code : node.getChildren("code")) {
+      myCodes.add(code.getValue());
     }
 
-    List channels = node.getChildren("channel");
-    for (Object channel : channels) {
-      myChannels.add(new UpdateChannel((Element)channel));
+    for (Element channel : node.getChildren("channel")) {
+      myChannels.add(new UpdateChannel(channel));
     }
   }
 
@@ -56,7 +54,9 @@ public class Product {
   @Nullable
   public UpdateChannel findUpdateChannelById(String id) {
     for (UpdateChannel channel : myChannels) {
-      if (id.equals(channel.getId())) return channel;
+      if (id.equals(channel.getId())) {
+        return channel;
+      }
     }
     return null;
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChannel.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChannel.java
index 3a3869146e94..4d986b4a3cc2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChannel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 package com.intellij.openapi.updateSettings.impl;
 
 import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -39,12 +40,11 @@ public class UpdateChannel {
   public static final String LICENSING_EAP = "eap";
   public static final String LICENSING_PRODUCTION = "production";
 
-  public UpdateChannel(Element node) {
+  public UpdateChannel(@NotNull Element node) {
     myId = node.getAttributeValue("id");
     myName = node.getAttributeValue("name");
     myStatus = ChannelStatus.fromCode(node.getAttributeValue("status"));
-    String licensing = node.getAttributeValue("licensing");
-    myLicensing = licensing != null ? licensing : LICENSING_PRODUCTION;
+    myLicensing = node.getAttributeValue("licensing", LICENSING_PRODUCTION);
 
     String majorVersion = node.getAttributeValue("majorVersion");
     myMajorVersion = majorVersion != null ? Integer.parseInt(majorVersion) : -1;
@@ -56,8 +56,8 @@ public class UpdateChannel {
     myFeedbackUrl = node.getAttributeValue("feedback");
 
     myBuilds = new ArrayList<BuildInfo>();
-    for (Object child : node.getChildren("build")) {
-      myBuilds.add(new BuildInfo((Element)child));
+    for (Element child : node.getChildren("build")) {
+      myBuilds.add(new BuildInfo(child));
     }
   }
 
@@ -69,7 +69,6 @@ public class UpdateChannel {
         build = info;
       }
     }
-
     return build;
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesInfo.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesInfo.java
index 46bd1182db61..0e2d93753958 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesInfo.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.intellij.openapi.updateSettings.impl;
 
-
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -26,11 +25,10 @@ import java.util.List;
 public class UpdatesInfo {
   @NotNull private final List<Product> myProducts;
 
-  public UpdatesInfo(Element element) {
+  public UpdatesInfo(@NotNull Element element) {
     myProducts = new ArrayList<Product>();
-    List children = element.getChildren();
-    for (Object child : children) {
-      myProducts.add(new Product((Element) child));
+    for (Element child : element.getChildren()) {
+      myProducts.add(new Product(child));
     }
   }
 

From 868770fa81092338309499885406e4f54e1e80f7 Mon Sep 17 00:00:00 2001
From: "Vladimir.Orlov" <Vladimir.Orlov@jetbrains.com>
Date: Mon, 27 Oct 2014 18:15:06 +0300
Subject: [PATCH 098/132] moved getCustomJDK to utils.gant to be available for
 all IDEA based products.

---
 build/scripts/utils.gant | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 2799ae550865..8e2376b71c55 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -691,6 +691,26 @@ private String submapToXml(Map properties, List keys) {
   return buff.toString()
 }
 
+private List<File> getChildren(File file) {
+  if (!file.isDirectory()) return []
+  return file.listFiles().sort { File f -> f.name.toLowerCase() }
+}
+
+binding.setVariable("getCustomJDK", { File customJdkDir ->
+  getChildren(customJdkDir).each {
+    if (it.getName().endsWith(".tar.gz")) {
+      def customJdkFileName = it.getAbsolutePath().substring(0, it.getAbsolutePath().length() - 3)
+      if (new File(customJdkFileName).exists()){ ant.delete(file: customJdkFileName) }
+      if (new File("${home}/build/jdk/custom_jdk_${buildNumber}.tar").exists()){
+        ant.delete(file: "${home}/build/jdk/custom_jdk_${buildNumber}.tar")
+      }
+      ant.gunzip(src: it.getAbsolutePath())
+      projectBuilder.info("customJdkFileName: " + customJdkFileName)
+      ant.copy(file: customJdkFileName, tofile: "${home}/build/jdk/custom_jdk_${buildNumber}.tar")
+    }
+  }
+})
+
 binding.setVariable("buildWinZip", { String zipPath, List paths ->
   projectBuilder.stage(".win.zip")
 

From f0556d52a6afcd9f5a92f06cfe54baa34ec9538f Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Mon, 27 Oct 2014 16:16:10 +0100
Subject: [PATCH 099/132] proper offset for light tree derived from nested lazy
 parseable

---
 .../intellij/lang/impl/PsiBuilderImpl.java    | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
index e03244e0e0e9..0bc853c76815 100644
--- a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
+++ b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
@@ -89,6 +89,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
 
   private final ASTNode myOriginalTree;
   private final MyTreeStructure myParentLightTree;
+  private final int myOffset;
 
   private static TokenSet ourAnyLanguageWhitespaceTokens = TokenSet.EMPTY;
 
@@ -132,7 +133,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
                         @Nullable ASTNode originalTree,
                         @Nullable MyTreeStructure parentLightTree) {
     this(project, containingFile, parserDefinition.getWhitespaceTokens(), parserDefinition.getCommentTokens(), lexer, charTable, text,
-         originalTree, parentLightTree);
+         originalTree, parentLightTree, 0);
   }
 
   public PsiBuilderImpl(Project project,
@@ -144,6 +145,19 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
                         @NotNull final CharSequence text,
                         @Nullable ASTNode originalTree,
                         @Nullable MyTreeStructure parentLightTree) {
+    this(project, containingFile, whiteSpaces, comments, lexer, charTable, text, originalTree, parentLightTree, 0);
+  }
+
+  private PsiBuilderImpl(Project project,
+                        PsiFile containingFile,
+                        @NotNull TokenSet whiteSpaces,
+                        @NotNull TokenSet comments,
+                        @NotNull Lexer lexer,
+                        CharTable charTable,
+                        @NotNull final CharSequence text,
+                        @Nullable ASTNode originalTree,
+                        @Nullable MyTreeStructure parentLightTree,
+                        int offset) {
     myProject = project;
     myFile = containingFile;
 
@@ -156,6 +170,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
     myCharTable = charTable;
     myOriginalTree = originalTree;
     myParentLightTree = parentLightTree;
+    myOffset = offset;
 
     cacheLexemes();
   }
@@ -174,8 +189,8 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
                         @NotNull final Lexer lexer,
                         @NotNull final LighterLazyParseableNode chameleon,
                         @NotNull final CharSequence text) {
-    this(project, chameleon.getContainingFile(), parserDefinition, lexer, chameleon.getCharTable(), text,
-         null, ((LazyParseableToken)chameleon).myParent);
+    this(project, chameleon.getContainingFile(), parserDefinition.getWhitespaceTokens(), parserDefinition.getCommentTokens(), lexer,
+         chameleon.getCharTable(), text, null, ((LazyParseableToken)chameleon).myParent, chameleon.getStartOffset());
   }
 
   private void cacheLexemes() {
@@ -335,12 +350,12 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
 
     @Override
     public int getStartOffset() {
-      return myBuilder.myLexStarts[myLexemeIndex];
+      return myBuilder.myLexStarts[myLexemeIndex] + myBuilder.myOffset;
     }
 
     @Override
     public int getEndOffset() {
-      return myBuilder.myLexStarts[myDoneMarker.myLexemeIndex];
+      return myBuilder.myLexStarts[myDoneMarker.myLexemeIndex] + myBuilder.myOffset;
     }
 
     @Override
@@ -487,12 +502,12 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
 
     @Override
     public int getEndOffset() {
-      return myTokenEnd;
+      return myTokenEnd + myBuilder.myOffset;
     }
 
     @Override
     public int getStartOffset() {
-      return myTokenStart;
+      return myTokenStart + myBuilder.myOffset;
     }
 
     public CharSequence getText() {
@@ -636,12 +651,12 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
 
     @Override
     public int getEndOffset() {
-      return myBuilder.myLexStarts[myLexemeIndex];
+      return myBuilder.myLexStarts[myLexemeIndex] + myBuilder.myOffset;
     }
 
     @Override
     public int getStartOffset() {
-      return myBuilder.myLexStarts[myLexemeIndex];
+      return myBuilder.myLexStarts[myLexemeIndex] + myBuilder.myOffset;
     }
 
     @Override
@@ -1474,6 +1489,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
     private final LimitedPool<Token> myPool;
     private final LimitedPool<LazyParseableToken> myLazyPool;
     private final StartMarker myRoot;
+    private final int myOffset;
 
     public MyTreeStructure(@NotNull StartMarker root, @Nullable final MyTreeStructure parentTree) {
       if (parentTree == null) {
@@ -1499,10 +1515,12 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
             return new LazyParseableToken();
           }
         });
+        myOffset = 0;
       }
       else {
         myPool = parentTree.myPool;
         myLazyPool = parentTree.myLazyPool;
+        myOffset = parentTree.getRoot().getStartOffset();
       }
       myRoot = root;
     }

From 29c1bfdc34378176f9bd348d124cfd368d4b469b Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 27 Oct 2014 18:28:52 +0300
Subject: [PATCH 100/132] external build: try to load configuration file
 several times (workaround for IDEA-102580, IDEA-96471)

---
 .../model/serialization/JpsLoaderBase.java    | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsLoaderBase.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsLoaderBase.java
index 18ad56192055..cf8c0cba3667 100644
--- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsLoaderBase.java
+++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsLoaderBase.java
@@ -15,6 +15,7 @@
  */
 package org.jetbrains.jps.model.serialization;
 
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtilRt;
@@ -30,6 +31,8 @@ import java.io.IOException;
  * @author nik
  */
 public abstract class JpsLoaderBase {
+  private static final Logger LOG = Logger.getInstance(JpsLoaderBase.class);
+  private static final int MAX_ATTEMPTS = 5;
   private final JpsMacroExpander myMacroExpander;
 
   protected JpsLoaderBase(JpsMacroExpander macroExpander) {
@@ -66,7 +69,7 @@ public abstract class JpsLoaderBase {
 
   protected static Element loadRootElement(final File file, final JpsMacroExpander macroExpander) {
     try {
-      final Element element = JDOMUtil.loadDocument(file).getRootElement();
+      final Element element = tryLoadRootElement(file);
       macroExpander.substitute(element, SystemInfo.isFileSystemCaseSensitive);
       return element;
     }
@@ -78,6 +81,24 @@ public abstract class JpsLoaderBase {
     }
   }
 
+  private static Element tryLoadRootElement(File file) throws IOException, JDOMException {
+    for (int i = 0; i < MAX_ATTEMPTS - 1; i++) {
+      try {
+        return JDOMUtil.loadDocument(file).getRootElement();
+      }
+      catch (Exception e) {
+        LOG.info("Loading attempt #" + i + " failed", e);
+      }
+      //most likely configuration file is being written by IDE so we'll wait a little
+      try {
+        //noinspection BusyWait
+        Thread.sleep(300);
+      }
+      catch (InterruptedException ignored) { }
+    }
+    return JDOMUtil.loadDocument(file).getRootElement();
+  }
+
   protected static boolean isXmlFile(File file) {
     return file.isFile() && FileUtilRt.extensionEquals(file.getName(), "xml");
   }

From f78b2033faaff2aff7e915f31993db9551f5736e Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Mon, 27 Oct 2014 16:37:43 +0100
Subject: [PATCH 101/132] ensure right launching sequence for preloaded build
 processes

---
 .../intellij/compiler/impl/CompileDriver.java |   8 +-
 .../compiler/server/BuildManager.java         | 516 +++++++++++-------
 .../org/jetbrains/jps/api/BasicFuture.java    |   7 +-
 .../src/org/jetbrains/jps/api/TaskFuture.java |  25 +
 4 files changed, 343 insertions(+), 213 deletions(-)
 create mode 100644 jps/jps-builders/src/org/jetbrains/jps/api/TaskFuture.java

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index d4a69206c3ba..a5685017d365 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -71,9 +71,9 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
-import org.jetbrains.jps.api.BasicFuture;
 import org.jetbrains.jps.api.CmdlineProtoUtil;
 import org.jetbrains.jps.api.CmdlineRemoteProto;
+import org.jetbrains.jps.api.TaskFuture;
 import org.jetbrains.jps.model.java.JavaSourceRootType;
 
 import javax.swing.*;
@@ -138,7 +138,7 @@ public class CompileDriver {
           return;
         }
         try {
-          final BasicFuture future = compileInExternalProcess(compileContext, true);
+          final TaskFuture future = compileInExternalProcess(compileContext, true);
           if (future != null) {
             while (!future.waitFor(200L, TimeUnit.MILLISECONDS)) {
               if (indicator.isCanceled()) {
@@ -194,7 +194,7 @@ public class CompileDriver {
   }
 
   @Nullable
-  private BasicFuture compileInExternalProcess(final @NotNull CompileContextImpl compileContext, final boolean onlyCheckUpToDate)
+  private TaskFuture compileInExternalProcess(final @NotNull CompileContextImpl compileContext, final boolean onlyCheckUpToDate)
     throws Exception {
     final CompileScope scope = compileContext.getCompileScope();
     final Collection<String> paths = CompileScopeUtil.fetchFiles(compileContext);
@@ -400,7 +400,7 @@ public class CompileDriver {
             return;
           }
 
-          final BasicFuture future = compileInExternalProcess(compileContext, false);
+          final TaskFuture future = compileInExternalProcess(compileContext, false);
           if (future != null) {
             while (!future.waitFor(200L, TimeUnit.MILLISECONDS)) {
               if (indicator.isCanceled()) {
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index 2c5b378d96ea..efaf9e2b4346 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -100,7 +100,8 @@ import org.jetbrains.jps.cmdline.ClasspathBootstrap;
 import org.jetbrains.jps.incremental.Utils;
 import org.jetbrains.jps.model.serialization.JpsGlobalLoader;
 
-import javax.tools.*;
+import javax.tools.JavaCompiler;
+import javax.tools.ToolProvider;
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
@@ -108,8 +109,7 @@ import java.net.InetSocketAddress;
 import java.nio.charset.Charset;
 import java.util.*;
 import java.util.List;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage.TargetTypeBuildScope;
@@ -148,10 +148,10 @@ public class BuildManager implements ApplicationComponent{
   private final File mySystemDirectory;
   private final ProjectManager myProjectManager;
 
-  private final Map<BasicFuture, Project> myAutomakeFutures = Collections.synchronizedMap(new HashMap<BasicFuture, Project>());
+  private final Map<TaskFuture, Project> myAutomakeFutures = Collections.synchronizedMap(new HashMap<TaskFuture, Project>());
   private final Map<String, RequestFuture> myBuildsInProgress = Collections.synchronizedMap(new HashMap<String, RequestFuture>());
-  private final Map<String, Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>> myPreloadedBuilds = 
-    Collections.synchronizedMap(new HashMap<String, Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>>());
+  private final Map<String, Future<Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>>> myPreloadedBuilds =
+    Collections.synchronizedMap(new HashMap<String, Future<Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>>>());
   private final BuildProcessClasspathManager myClasspathManager = new BuildProcessClasspathManager();
   private final SequentialTaskExecutor myRequestsProcessor = new SequentialTaskExecutor(PooledThreadExecutor.INSTANCE);
   private final Map<String, ProjectData> myProjectDataMap = Collections.synchronizedMap(new HashMap<String, ProjectData>());
@@ -447,7 +447,7 @@ public class BuildManager implements ApplicationComponent{
     }
     final List<TargetTypeBuildScope> scopes = CmdlineProtoUtil.createAllModulesScopes(false);
     final AutoMakeMessageHandler handler = new AutoMakeMessageHandler(project);
-    final BasicFuture future = scheduleBuild(
+    final TaskFuture future = scheduleBuild(
       project, false, true, false, scopes, Collections.<String>emptyList(), Collections.<String, String>emptyMap(), handler
     );
     if (future != null) {
@@ -526,12 +526,12 @@ public class BuildManager implements ApplicationComponent{
     return false;
   }
 
-  public Collection<BasicFuture> cancelAutoMakeTasks(Project project) {
-    final Collection<BasicFuture> futures = new SmartList<BasicFuture>();
+  public Collection<TaskFuture> cancelAutoMakeTasks(Project project) {
+    final Collection<TaskFuture> futures = new SmartList<TaskFuture>();
     synchronized (myAutomakeFutures) {
-      for (Map.Entry<BasicFuture, Project> entry : myAutomakeFutures.entrySet()) {
+      for (Map.Entry<TaskFuture, Project> entry : myAutomakeFutures.entrySet()) {
         if (entry.getValue().equals(project)) {
-          final BasicFuture future = entry.getKey();
+          final TaskFuture future = entry.getKey();
           future.cancel(false);
           futures.add(future);
         }
@@ -542,15 +542,15 @@ public class BuildManager implements ApplicationComponent{
 
   private void cancelPreloadedBuilds(Project project) {
     final String projectPath = getProjectPath(project);
-    final Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> pair = myPreloadedBuilds.remove(projectPath);
-    if (pair != null) {
-      final RequestFuture<PreloadedProcessMessageHandler> future = pair.first;
-      myMessageDispatcher.cancelSession(future.getRequestID());
-      runCommand(new Runnable() {
-        @Override
-        public void run() {
+    runCommand(new Runnable() {
+      @Override
+      public void run() {
+        Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> pair = takePreloadedProcess(projectPath);
+        if (pair != null) {
+          final RequestFuture<PreloadedProcessMessageHandler> future = pair.first;
+          myMessageDispatcher.cancelSession(future.getRequestID());
           // waiting for preloaded process from project's task queue guarantees no build is started for this project
-          // until this one gracefully exits and closes all its storages 
+          // until this one gracefully exits and closes all its storages
           getProjectData(projectPath).taskQueue.submit(new Runnable() {
             @Override
             public void run() {
@@ -558,207 +558,221 @@ public class BuildManager implements ApplicationComponent{
             }
           });
         }
-      });
-    }
+      }
+    });
   }
 
   @Nullable
-  public BasicFuture scheduleBuild(
+  private Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> takePreloadedProcess(String projectPath) {
+    Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> result;
+    final Future<Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>> preloadProgress = myPreloadedBuilds.remove(projectPath);
+    try {
+      result = preloadProgress != null ? preloadProgress.get() : null;
+    }
+    catch (Throwable e) {
+      LOG.info(e);
+      result = null;
+    }
+    return result;
+  }
+
+  @Nullable
+  public TaskFuture scheduleBuild(
     final Project project, final boolean isRebuild, final boolean isMake,
     final boolean onlyCheckUpToDate, final List<TargetTypeBuildScope> scopes,
     final Collection<String> paths,
     final Map<String, String> userData, final DefaultMessageHandler messageHandler) {
 
     final String projectPath = getProjectPath(project);
-
-    final Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> preloaded = myPreloadedBuilds.remove(projectPath);
-    final RequestFuture<PreloadedProcessMessageHandler> preloadedFuture = preloaded != null? preloaded.first : null;
-    final boolean usingPreloadedProcess = preloadedFuture != null;
-    
-    final UUID sessionId;
     final BuilderMessageHandler handler = new NotifyingMessageHandler(project, messageHandler, messageHandler instanceof AutoMakeMessageHandler);
-    if (usingPreloadedProcess) {
-      LOG.info("Using preloaded build process to compile " + projectPath);
-      sessionId = preloadedFuture.getRequestID();
-      preloadedFuture.getMessageHandler().setDelegateHandler(handler);
-    }
-    else {
-      sessionId = UUID.randomUUID();
-    }
-    
     try {
       ensureListening();
     }
     catch (Exception e) {
+      final UUID sessionId = UUID.randomUUID(); // the actual session did not start, use random UUID
       handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure(e.getMessage(), null));
       handler.sessionTerminated(sessionId);
       return null;
     }
 
-    try {
-      final RequestFuture<? extends BuilderMessageHandler> future = usingPreloadedProcess? preloadedFuture : new RequestFuture<BuilderMessageHandler>(handler, sessionId, new RequestFuture.CancelAction<BuilderMessageHandler>() {
-        @Override
-        public void cancel(RequestFuture<BuilderMessageHandler> future) throws Exception {
-          myMessageDispatcher.cancelSession(future.getRequestID());
+    final DelegateFuture<BuilderMessageHandler> _future = new DelegateFuture<BuilderMessageHandler>();
+    // by using the same queue that processes events we ensure that
+    // the build will be aware of all events that have happened before this request
+    runCommand(new Runnable() {
+      @Override
+      public void run() {
+
+        final Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> preloaded = takePreloadedProcess(projectPath);
+        final RequestFuture<PreloadedProcessMessageHandler> preloadedFuture = preloaded != null? preloaded.first : null;
+        final boolean usingPreloadedProcess = preloadedFuture != null;
+
+        final UUID sessionId;
+        if (usingPreloadedProcess) {
+          LOG.info("Using preloaded build process to compile " + projectPath);
+          sessionId = preloadedFuture.getRequestID();
+          preloadedFuture.getMessageHandler().setDelegateHandler(handler);
+        }
+        else {
+          sessionId = UUID.randomUUID();
         }
-      });
-      // by using the same queue that processes events we ensure that
-      // the build will be aware of all events that have happened before this request
-      runCommand(new Runnable() {
-        @Override
-        public void run() {
-          if (!usingPreloadedProcess && (future.isCancelled() || project.isDisposed())) {
-            // in case of preloaded process the process was already running, so the handler will be notified upon process termination
-            handler.sessionTerminated(sessionId);
-            future.setDone();
-            return;
-          }
 
-          final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings globals =
-            CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings.newBuilder().setGlobalOptionsPath(PathManager.getOptionsPath()).build();
-          CmdlineRemoteProto.Message.ControllerMessage.FSEvent currentFSChanges;
-          final SequentialTaskExecutor projectTaskQueue;
-          synchronized (myProjectDataMap) {
-            final ProjectData data = getProjectData(projectPath);
-            if (isRebuild) {
-              data.dropChanges();
-            }
-            if (IS_UNIT_TEST_MODE) {
-              LOG.info("Scheduling build for " +
-                       projectPath +
-                       "; CHANGED: " +
-                       new HashSet<String>(convertToStringPaths(data.myChanged)) +
-                       "; DELETED: " +
-                       new HashSet<String>(convertToStringPaths(data.myDeleted)));
-            }
-            currentFSChanges = data.getAndResetRescanFlag() ? null : data.createNextEvent();
-            projectTaskQueue = data.taskQueue;
+        final RequestFuture<? extends BuilderMessageHandler> future = usingPreloadedProcess? preloadedFuture : new RequestFuture<BuilderMessageHandler>(handler, sessionId, new RequestFuture.CancelAction<BuilderMessageHandler>() {
+          @Override
+          public void cancel(RequestFuture<BuilderMessageHandler> future) throws Exception {
+            myMessageDispatcher.cancelSession(future.getRequestID());
           }
+        });
+        _future.setDelegate(future);
 
-          final CmdlineRemoteProto.Message.ControllerMessage params;
+        if (!usingPreloadedProcess && (future.isCancelled() || project.isDisposed())) {
+          // in case of preloaded process the process was already running, so the handler will be notified upon process termination
+          handler.sessionTerminated(sessionId);
+          ((BasicFuture)future).setDone();
+          return;
+        }
+
+        final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings globals =
+          CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings.newBuilder().setGlobalOptionsPath(PathManager.getOptionsPath()).build();
+        CmdlineRemoteProto.Message.ControllerMessage.FSEvent currentFSChanges;
+        final SequentialTaskExecutor projectTaskQueue;
+        synchronized (myProjectDataMap) {
+          final ProjectData data = getProjectData(projectPath);
           if (isRebuild) {
-            params = CmdlineProtoUtil.createBuildRequest(projectPath, scopes, Collections.<String>emptyList(), userData, globals, null);
+            data.dropChanges();
           }
-          else if (onlyCheckUpToDate) {
-            params = CmdlineProtoUtil.createUpToDateCheckRequest(projectPath, scopes, paths, userData, globals, currentFSChanges);
-          }
-          else {
-            params = CmdlineProtoUtil.createBuildRequest(projectPath, scopes, isMake ? Collections.<String>emptyList() : paths, userData, globals, currentFSChanges);
-          }
-          if (!usingPreloadedProcess) {
-            myMessageDispatcher.registerBuildMessageHandler(future, params);
+          if (IS_UNIT_TEST_MODE) {
+            LOG.info("Scheduling build for " +
+                     projectPath +
+                     "; CHANGED: " +
+                     new HashSet<String>(convertToStringPaths(data.myChanged)) +
+                     "; DELETED: " +
+                     new HashSet<String>(convertToStringPaths(data.myDeleted)));
           }
+          currentFSChanges = data.getAndResetRescanFlag() ? null : data.createNextEvent();
+          projectTaskQueue = data.taskQueue;
+        }
 
-          try {
-            projectTaskQueue.submit(new Runnable() {
-              @Override
-              public void run() {
-                Throwable execFailure = null;
-                try {
-                  if (project.isDisposed()) {
-                    if (usingPreloadedProcess) {
-                      future.cancel(true);
-                    }
-                    else {
-                      return;
-                    }
-                  }
-                  myBuildsInProgress.put(projectPath, future);
-                  final OSProcessHandler processHandler;
-                  final StringBuilder errorsOnLaunch = new StringBuilder();
+        final CmdlineRemoteProto.Message.ControllerMessage params;
+        if (isRebuild) {
+          params = CmdlineProtoUtil.createBuildRequest(projectPath, scopes, Collections.<String>emptyList(), userData, globals, null);
+        }
+        else if (onlyCheckUpToDate) {
+          params = CmdlineProtoUtil.createUpToDateCheckRequest(projectPath, scopes, paths, userData, globals, currentFSChanges);
+        }
+        else {
+          params = CmdlineProtoUtil.createBuildRequest(projectPath, scopes, isMake ? Collections.<String>emptyList() : paths, userData, globals, currentFSChanges);
+        }
+        if (!usingPreloadedProcess) {
+          myMessageDispatcher.registerBuildMessageHandler(future, params);
+        }
+
+        try {
+          projectTaskQueue.submit(new Runnable() {
+            @Override
+            public void run() {
+              Throwable execFailure = null;
+              try {
+                if (project.isDisposed()) {
                   if (usingPreloadedProcess) {
-                    final boolean paramsSent = myMessageDispatcher.sendBuildParameters(future.getRequestID(), params);
-                    if (!paramsSent) {
-                      myMessageDispatcher.cancelSession(future.getRequestID());
-                    }
-                    processHandler = preloaded.second;
+                    future.cancel(true);
                   }
                   else {
-                    processHandler = launchBuildProcess(project, myListenPort, sessionId, false);
-                    processHandler.addProcessListener(new ProcessAdapter() {
-                      @Override
-                      public void onTextAvailable(ProcessEvent event, Key outputType) {
-                        if (ProcessOutputTypes.STDERR.equals(outputType)) {
-                          if (errorsOnLaunch.length() < 1024) {
-                            final String text = event.getText();
-                            if (!StringUtil.isEmptyOrSpaces(text)) {
-                              errorsOnLaunch.append(text);
-                            }
+                    return;
+                  }
+                }
+                myBuildsInProgress.put(projectPath, future);
+                final OSProcessHandler processHandler;
+                final StringBuilder errorsOnLaunch = new StringBuilder();
+                if (usingPreloadedProcess) {
+                  final boolean paramsSent = myMessageDispatcher.sendBuildParameters(future.getRequestID(), params);
+                  if (!paramsSent) {
+                    myMessageDispatcher.cancelSession(future.getRequestID());
+                  }
+                  processHandler = preloaded.second;
+                }
+                else {
+                  processHandler = launchBuildProcess(project, myListenPort, sessionId, false);
+                  processHandler.addProcessListener(new ProcessAdapter() {
+                    @Override
+                    public void onTextAvailable(ProcessEvent event, Key outputType) {
+                      if (ProcessOutputTypes.STDERR.equals(outputType)) {
+                        if (errorsOnLaunch.length() < 1024) {
+                          final String text = event.getText();
+                          if (!StringUtil.isEmptyOrSpaces(text)) {
+                            errorsOnLaunch.append(text);
                           }
                         }
                       }
-                    });
-                    processHandler.startNotify();
-                  }
-
-                  final boolean terminated = processHandler.waitFor();
-                  if (terminated) {
-                    final int exitValue = processHandler.getProcess().exitValue();
-                    if (exitValue != 0) {
-                      final StringBuilder msg = new StringBuilder();
-                      msg.append("Abnormal build process termination: ");
-                      if (errorsOnLaunch.length() > 0) {
-                        msg.append("\n").append(errorsOnLaunch);
-                      }
-                      else {
-                        msg.append("unknown error");
-                      }
-                      handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure(msg.toString(), null));
                     }
-                  }
-                  else {
-                    handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure("Disconnected from build process", null));
+                  });
+                  processHandler.startNotify();
+                }
+
+                final boolean terminated = processHandler.waitFor();
+                if (terminated) {
+                  final int exitValue = processHandler.getProcess().exitValue();
+                  if (exitValue != 0) {
+                    final StringBuilder msg = new StringBuilder();
+                    msg.append("Abnormal build process termination: ");
+                    if (errorsOnLaunch.length() > 0) {
+                      msg.append("\n").append(errorsOnLaunch);
+                    }
+                    else {
+                      msg.append("unknown error");
+                    }
+                    handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure(msg.toString(), null));
                   }
                 }
-                catch (Throwable e) {
-                  execFailure = e;
-                }
-                finally {
-                  myBuildsInProgress.remove(projectPath);
-                  if (myMessageDispatcher.getAssociatedChannel(sessionId) == null) {
-                    // either the connection has never been established (process not started or execution failed), or no messages were sent from the launched process.
-                    // in this case the session cannot be unregistered by the message dispatcher
-                    final BuilderMessageHandler unregistered = myMessageDispatcher.unregisterBuildMessageHandler(sessionId);
-                    if (unregistered != null) {
-                      if (execFailure != null) {
-                        unregistered.handleFailure(sessionId, CmdlineProtoUtil.createFailure(execFailure.getMessage(), execFailure));
-                      }
-                      unregistered.sessionTerminated(sessionId);
-                    }
-                  }
-
-                  if (Registry.is("compiler.process.preload") && !project.isDisposed()) {
-                    try {
-                      final Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> pair = launchPreloadedBuildProcess(project);
-                      myPreloadedBuilds.put(projectPath, pair);
-                    }
-                    catch (Exception e) {
-                      LOG.info("Error pre-loading build process for project " + projectPath, e);
-                    }
-                  }
-                  
+                else {
+                  handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure("Disconnected from build process", null));
                 }
               }
-            });
-          }
-          catch (Throwable e) {
-            final BuilderMessageHandler unregistered = myMessageDispatcher.unregisterBuildMessageHandler(sessionId);
-            if (unregistered != null) {
-              unregistered.handleFailure(sessionId, CmdlineProtoUtil.createFailure(e.getMessage(), e));
-              unregistered.sessionTerminated(sessionId);
+              catch (Throwable e) {
+                execFailure = e;
+              }
+              finally {
+                myBuildsInProgress.remove(projectPath);
+                if (myMessageDispatcher.getAssociatedChannel(sessionId) == null) {
+                  // either the connection has never been established (process not started or execution failed), or no messages were sent from the launched process.
+                  // in this case the session cannot be unregistered by the message dispatcher
+                  final BuilderMessageHandler unregistered = myMessageDispatcher.unregisterBuildMessageHandler(sessionId);
+                  if (unregistered != null) {
+                    if (execFailure != null) {
+                      unregistered.handleFailure(sessionId, CmdlineProtoUtil.createFailure(execFailure.getMessage(), execFailure));
+                    }
+                    unregistered.sessionTerminated(sessionId);
+                  }
+                }
+
+                if (Registry.is("compiler.process.preload") && !project.isDisposed()) {
+                  runCommand(new Runnable() {
+                    public void run() {
+                      try {
+                        final Future<Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>> preloadResult = launchPreloadedBuildProcess(project, projectTaskQueue);
+                        myPreloadedBuilds.put(projectPath, preloadResult);
+                      }
+                      catch (Exception e) {
+                        LOG.info("Error pre-loading build process for project " + projectPath, e);
+                      }
+                    }
+                  });
+                }
+
+              }
             }
+          });
+        }
+        catch (Throwable e) {
+          final BuilderMessageHandler unregistered = myMessageDispatcher.unregisterBuildMessageHandler(sessionId);
+          if (unregistered != null) {
+            unregistered.handleFailure(sessionId, CmdlineProtoUtil.createFailure(e.getMessage(), e));
+            unregistered.sessionTerminated(sessionId);
           }
         }
-      });
+      }
+    });
 
-      return future;
-    }
-    catch (Throwable e) {
-      handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure(e.getMessage(), e));
-      handler.sessionTerminated(sessionId);
-    }
-
-    return null;
+    return _future;
   }
 
   @NotNull
@@ -798,37 +812,42 @@ public class BuildManager implements ApplicationComponent{
     return "com.intellij.compiler.server.BuildManager";
   }
 
-  private Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> launchPreloadedBuildProcess(final Project project) throws Exception {
+  private Future<Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>> launchPreloadedBuildProcess(final Project project, SequentialTaskExecutor projectTaskQueue) throws Exception {
     ensureListening();
     
-    final RequestFuture<PreloadedProcessMessageHandler> future = new RequestFuture<PreloadedProcessMessageHandler>(new PreloadedProcessMessageHandler(project), UUID.randomUUID(), new RequestFuture.CancelAction<PreloadedProcessMessageHandler>() {
-      @Override
-      public void cancel(RequestFuture<PreloadedProcessMessageHandler> future) throws Exception {
-        myMessageDispatcher.cancelSession(future.getRequestID());
+    // launching build process from projectTaskQueue ensures that no other build process for this project is currently running
+    return projectTaskQueue.submit(new Callable<Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>>() {
+      public Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> call() throws Exception {
+        final RequestFuture<PreloadedProcessMessageHandler> future = new RequestFuture<PreloadedProcessMessageHandler>(new PreloadedProcessMessageHandler(project), UUID.randomUUID(), new RequestFuture.CancelAction<PreloadedProcessMessageHandler>() {
+          @Override
+          public void cancel(RequestFuture<PreloadedProcessMessageHandler> future) throws Exception {
+            myMessageDispatcher.cancelSession(future.getRequestID());
+          }
+        });
+        try {
+          myMessageDispatcher.registerBuildMessageHandler(future, null);
+          final OSProcessHandler processHandler = launchBuildProcess(project, myListenPort, future.getRequestID(), true);
+          processHandler.addProcessListener(new ProcessAdapter() {
+            @Override
+            public void onTextAvailable(ProcessEvent event, Key outputType) {
+              if (ProcessOutputTypes.STDERR.equals(outputType)) {
+                final String text = event.getText();
+                if (!StringUtil.isEmptyOrSpaces(text)) {
+                  LOG.info("PRELOADED_BUILD_PROCESS: " + text);
+                }
+              }
+            }
+          });
+
+          processHandler.startNotify();
+          return Pair.create(future, processHandler);
+        }
+        catch (ExecutionException e) {
+          myMessageDispatcher.unregisterBuildMessageHandler(future.getRequestID());
+          throw e;
+        }
       }
     });
-    myMessageDispatcher.registerBuildMessageHandler(future, null);
-    try {
-      final OSProcessHandler processHandler = launchBuildProcess(project, myListenPort, future.getRequestID(), true);
-      processHandler.addProcessListener(new ProcessAdapter() {
-        @Override
-        public void onTextAvailable(ProcessEvent event, Key outputType) {
-          if (ProcessOutputTypes.STDERR.equals(outputType)) {
-            final String text = event.getText();
-            if (!StringUtil.isEmptyOrSpaces(text)) {
-              LOG.info("PRELOADED_BUILD_PROCESS: " + text);
-            }
-          }
-        }
-      });
-      
-      processHandler.startNotify();
-      return Pair.create(future, processHandler);
-    }
-    catch (ExecutionException e) {
-      myMessageDispatcher.unregisterBuildMessageHandler(future.getRequestID());
-      throw e;
-    }
   }
   
   private OSProcessHandler launchBuildProcess(Project project, final int port, final UUID sessionId, boolean requestProjectPreload) throws ExecutionException {
@@ -1300,7 +1319,7 @@ public class BuildManager implements ApplicationComponent{
     @Override
     public void projectClosing(Project project) {
       cancelPreloadedBuilds(project);
-      for (BasicFuture future : cancelAutoMakeTasks(project)) {
+      for (TaskFuture future : cancelAutoMakeTasks(project)) {
         future.waitFor(500, TimeUnit.MILLISECONDS);
       }
     }
@@ -1460,5 +1479,88 @@ public class BuildManager implements ApplicationComponent{
       return "/";
     }
   }
-  
+
+  private static final class DelegateFuture<T> implements TaskFuture<T> {
+    @Nullable
+    private TaskFuture<? extends T> myDelegate;
+    private Boolean myRequestedCancelState = null;
+
+    @NotNull
+    public synchronized TaskFuture<? extends T> getDelegate() {
+      TaskFuture<? extends T> delegate = myDelegate;
+      while (delegate == null) {
+        try {
+          wait();
+        }
+        catch (InterruptedException ignored) {
+        }
+        delegate = myDelegate;
+      }
+      return delegate;
+    }
+
+    public synchronized boolean setDelegate(@NotNull TaskFuture<? extends T> delegate) {
+      if (myDelegate == null) {
+        try {
+          myDelegate = delegate;
+          if (myRequestedCancelState != null) {
+            myDelegate.cancel(myRequestedCancelState);
+          }
+        }
+        finally {
+          notifyAll();
+        }
+        return true;
+      }
+      return false;
+    }
+
+    public synchronized boolean cancel(boolean mayInterruptIfRunning) {
+      final TaskFuture<? extends T> delegate = myDelegate;
+      if (delegate == null) {
+        myRequestedCancelState = mayInterruptIfRunning;
+        return true;
+      }
+      return delegate.cancel(mayInterruptIfRunning);
+    }
+
+    public void waitFor() {
+      getDelegate().waitFor();
+    }
+
+    public boolean waitFor(long timeout, TimeUnit unit) {
+      return getDelegate().waitFor(timeout, unit);
+    }
+
+    public boolean isCancelled() {
+      final TaskFuture<? extends T> delegate;
+      synchronized (this) {
+        delegate = myDelegate;
+        if (delegate == null) {
+          return myRequestedCancelState != null;
+        }
+      }
+      return delegate.isCancelled();
+    }
+
+    public boolean isDone() {
+      final TaskFuture<? extends T> delegate;
+      synchronized (this) {
+        delegate = myDelegate;
+        if (delegate == null) {
+          return false;
+        }
+      }
+      return delegate.isDone();
+    }
+
+    public T get() throws InterruptedException, java.util.concurrent.ExecutionException {
+      return getDelegate().get();
+    }
+
+    public T get(long timeout, TimeUnit unit) throws InterruptedException, java.util.concurrent.ExecutionException, TimeoutException {
+      return getDelegate().get(timeout, unit);
+    }
+  }
+
 }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/api/BasicFuture.java b/jps/jps-builders/src/org/jetbrains/jps/api/BasicFuture.java
index 0717de1c61e7..514ec5efc8d4 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/api/BasicFuture.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/api/BasicFuture.java
@@ -15,14 +15,17 @@
  */
 package org.jetbrains.jps.api;
 
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @author Eugene Zhuravlev
  *         Date: 5/3/12
  */
-public class BasicFuture<T> implements Future<T> {
+public class BasicFuture<T> implements TaskFuture<T> {
   protected final Semaphore mySemaphore = new Semaphore(1);
   private final AtomicBoolean myDone = new AtomicBoolean(false);
   private final AtomicBoolean myCanceledState = new AtomicBoolean(false);
diff --git a/jps/jps-builders/src/org/jetbrains/jps/api/TaskFuture.java b/jps/jps-builders/src/org/jetbrains/jps/api/TaskFuture.java
new file mode 100644
index 000000000000..c09c8446422b
--- /dev/null
+++ b/jps/jps-builders/src/org/jetbrains/jps/api/TaskFuture.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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 org.jetbrains.jps.api;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+public interface TaskFuture<T> extends Future<T> {
+  void waitFor();
+
+  boolean waitFor(long timeout, TimeUnit unit);
+}

From a17c63dc86891f15d8e6191c0a2e382dd4cfc19c Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 27 Oct 2014 18:48:57 +0300
Subject: [PATCH 102/132] IDEA-131922 Debugger: Inspect from Referring Objects
 causes NPE at ClassRenderer.createFieldDescriptor()

---
 .../debugger/actions/JavaReferringObjectsValue.java         | 6 +++---
 .../impl/src/com/intellij/debugger/engine/JavaValue.java    | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java b/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java
index e892a425ca75..96ba9e6eb54d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java
@@ -50,7 +50,7 @@ public class JavaReferringObjectsValue extends JavaValue {
   }
 
   public JavaReferringObjectsValue(@NotNull JavaValue javaValue, boolean isField) {
-    super(null, javaValue.getDescriptor(), javaValue.getEvaluationContext(), null, false);
+    super(null, javaValue.getDescriptor(), javaValue.getEvaluationContext(), javaValue.getNodeManager(), false);
     myIsField = isField;
   }
 
@@ -84,7 +84,7 @@ public class JavaReferringObjectsValue extends JavaValue {
                   return reference;
                 }
               };
-              children.add(new JavaReferringObjectsValue(null, descriptor, getEvaluationContext(), null, true));
+              children.add(new JavaReferringObjectsValue(null, descriptor, getEvaluationContext(), getNodeManager(), true));
               i++;
             }
             else {
@@ -109,7 +109,7 @@ public class JavaReferringObjectsValue extends JavaValue {
                   return null;
                 }
               };
-              children.add("Referrer " + i++, new JavaReferringObjectsValue(null, descriptor, getEvaluationContext(), null, false));
+              children.add("Referrer " + i++, new JavaReferringObjectsValue(null, descriptor, getEvaluationContext(), getNodeManager(), false));
             }
           }
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
index 3df508e331a9..6ea0b626cd00 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
@@ -113,6 +113,10 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
     return myEvaluationContext;
   }
 
+  public NodeManagerImpl getNodeManager() {
+    return myNodeManager;
+  }
+
   @Override
   public void computePresentation(@NotNull final XValueNode node, @NotNull XValuePlace place) {
     final SuspendContextImpl suspendContext = myEvaluationContext.getSuspendContext();

From 96f572b2544cfb62ae580a12275ae36aed167b5d Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Mon, 27 Oct 2014 18:31:39 +0300
Subject: [PATCH 103/132] use RecursionManager instead of manual recursion
 prevention #WEB-331 fixed

---
 .../psi/impl/source/xml/XmlEntityRefImpl.java | 156 +++++++++---------
 1 file changed, 78 insertions(+), 78 deletions(-)

diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java
index b74834a28162..ee6248b6c1bf 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java
@@ -16,7 +16,10 @@
 package com.intellij.psi.impl.source.xml;
 
 import com.intellij.ide.highlighter.DTDFileType;
+import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.RecursionManager;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
 import com.intellij.psi.search.PsiElementProcessor;
@@ -49,8 +52,6 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef {
     super(XmlElementType.XML_ENTITY_REF);
   }
 
-  private static final Key<String> EVALUATION_IN_PROCESS = Key.create("EvalKey");
-
   @Override
   public XmlEntityDecl resolve(PsiFile targetFile) {
     String text = getText();
@@ -77,12 +78,12 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef {
       if (value == null) {
         final PsiManager manager = element.getManager();
         if(manager == null){
-          return resolveEntity(targetElement, entityName, containingFile).getValue();
+          return doResolveEntity(targetElement, entityName, containingFile).getValue();
         }
         value = CachedValuesManager.getManager(manager.getProject()).createCachedValue(new CachedValueProvider<XmlEntityDecl>() {
           @Override
           public Result<XmlEntityDecl> compute() {
-            return resolveEntity(targetElement, entityName, containingFile);
+            return doResolveEntity(targetElement, entityName, containingFile);
           }
         });
 
@@ -95,95 +96,94 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef {
 
   private static final Key<Boolean> DISABLE_ENTITY_EXPAND = Key.create("disable.entity.expand");
 
-  private static CachedValueProvider.Result<XmlEntityDecl> resolveEntity(final PsiElement targetElement, final String entityName, PsiFile contextFile) {
-    if (targetElement.getUserData(EVALUATION_IN_PROCESS) != null) {
-      return new CachedValueProvider.Result<XmlEntityDecl>(null,targetElement);
-    }
-    try {
-      targetElement.putUserData(EVALUATION_IN_PROCESS, "");
-      final List<PsiElement> deps = new ArrayList<PsiElement>();
-      final XmlEntityDecl[] result = {null};
+  private static CachedValueProvider.Result<XmlEntityDecl> doResolveEntity(final PsiElement targetElement,
+                                                                           final String entityName,
+                                                                           final PsiFile contextFile) {
+    return RecursionManager.doPreventingRecursion(targetElement, true, new Computable<CachedValueProvider.Result<XmlEntityDecl>>() {
+      @Override
+      public CachedValueProvider.Result<XmlEntityDecl> compute() {
+        final List<PsiElement> deps = new ArrayList<PsiElement>();
+        final XmlEntityDecl[] result = {null};
 
-      PsiElementProcessor processor = new PsiElementProcessor() {
-        @Override
-        public boolean execute(@NotNull PsiElement element) {
-          if (element instanceof XmlDoctype) {
-            XmlDoctype xmlDoctype = (XmlDoctype)element;
-            final String dtdUri = getDtdForEntity(xmlDoctype);
-            if (dtdUri != null) {
-              XmlFile file = XmlUtil.getContainingFile(element);
-              if (file == null) return true;
-              final XmlFile xmlFile = XmlUtil.findNamespace(file, dtdUri);
-              if (xmlFile != null) {
-                if (xmlFile != targetElement) {
-                  deps.add(xmlFile);
-                  if(!XmlUtil.processXmlElements(xmlFile, this,true)) return false;
+        PsiElementProcessor processor = new PsiElementProcessor() {
+          @Override
+          public boolean execute(@NotNull PsiElement element) {
+            if (element instanceof XmlDoctype) {
+              XmlDoctype xmlDoctype = (XmlDoctype)element;
+              final String dtdUri = getDtdForEntity(xmlDoctype);
+              if (dtdUri != null) {
+                XmlFile file = XmlUtil.getContainingFile(element);
+                if (file == null) return true;
+                final XmlFile xmlFile = XmlUtil.findNamespace(file, dtdUri);
+                if (xmlFile != null) {
+                  if (xmlFile != targetElement) {
+                    deps.add(xmlFile);
+                    if (!XmlUtil.processXmlElements(xmlFile, this, true)) return false;
+                  }
                 }
               }
+              final XmlMarkupDecl markupDecl = xmlDoctype.getMarkupDecl();
+              if (markupDecl != null) {
+                if (!XmlUtil.processXmlElements(markupDecl, this, true)) return false;
+              }
             }
-            final XmlMarkupDecl markupDecl = xmlDoctype.getMarkupDecl();
-            if (markupDecl != null) {
-              if (!XmlUtil.processXmlElements(markupDecl, this, true)) return false;
+            else if (element instanceof XmlEntityDecl) {
+              XmlEntityDecl entityDecl = (XmlEntityDecl)element;
+              final String declName = entityDecl.getName();
+              if (StringUtil.equals(declName, entityName)) {
+                result[0] = entityDecl;
+                return false;
+              }
             }
+
+            return true;
           }
-          else if (element instanceof XmlEntityDecl) {
-            XmlEntityDecl entityDecl = (XmlEntityDecl)element;
-            final String declName = entityDecl.getName();
-            if (declName.equals(entityName)) {
-              result[0] = entityDecl;
-              return false;
-            }
+        };
+        FileViewProvider provider = targetElement.getContainingFile().getViewProvider();
+        deps.add(provider.getPsi(provider.getBaseLanguage()));
+
+        boolean notfound = PsiTreeUtil.processElements(targetElement, processor);
+        if (notfound) {
+          if (contextFile != targetElement && contextFile != null && contextFile.isValid()) {
+            notfound = PsiTreeUtil.processElements(contextFile, processor);
           }
-
-          return true;
         }
-      };
-      FileViewProvider provider = targetElement.getContainingFile().getViewProvider();
-      deps.add(provider.getPsi(provider.getBaseLanguage()));
 
-      boolean notfound = PsiTreeUtil.processElements(targetElement, processor);
-      if (notfound) {
-        if (contextFile != targetElement && contextFile != null && contextFile.isValid()) {
-          notfound = PsiTreeUtil.processElements(contextFile, processor);
-        }
-      }
+        if (notfound &&       // no dtd ref at all
+            targetElement instanceof XmlFile &&
+            deps.size() == 1 &&
+            ((XmlFile)targetElement).getFileType() != DTDFileType.INSTANCE
+          ) {
+          XmlDocument document = ((XmlFile)targetElement).getDocument();
+          final XmlTag rootTag = document != null ? document.getRootTag() : null;
+          XmlFile descriptorFile = null;
 
-      if (notfound &&       // no dtd ref at all
-          targetElement instanceof XmlFile &&
-          deps.size() == 1 &&
-          ((XmlFile)targetElement).getFileType() != DTDFileType.INSTANCE
-         ) {
-        XmlDocument document = ((XmlFile)targetElement).getDocument();
-        final XmlTag rootTag = document.getRootTag();
-        XmlFile descriptorFile = null;
-
-        if (HtmlUtil.isHtml5Document(document)) {
-          descriptorFile = XmlUtil.findXmlFile((XmlFile)targetElement, Html5SchemaProvider.getCharsDtdLocation());
-        } else if (rootTag != null && document.getUserData(DISABLE_ENTITY_EXPAND) == null) {
-          final XmlElementDescriptor descriptor = rootTag.getDescriptor();
+          if (HtmlUtil.isHtml5Document(document)) {
+            descriptorFile = XmlUtil.findXmlFile((XmlFile)targetElement, Html5SchemaProvider.getCharsDtdLocation());
+          }
+          else if (rootTag != null && document.getUserData(DISABLE_ENTITY_EXPAND) == null) {
+            final XmlElementDescriptor descriptor = rootTag.getDescriptor();
 
             if (descriptor != null && !(descriptor instanceof AnyXmlElementDescriptor)) {
               PsiElement element = descriptor.getDeclaration();
-              final PsiFile containingFile = element != null ? element.getContainingFile():null;
-              descriptorFile = containingFile instanceof XmlFile ? (XmlFile)containingFile:null;
+              final PsiFile containingFile = element != null ? element.getContainingFile() : null;
+              descriptorFile = containingFile instanceof XmlFile ? (XmlFile)containingFile : null;
             }
+          }
+          if (descriptorFile != null &&
+              !descriptorFile.getName().equals(((XmlFile)targetElement).getName() + ".dtd")) {
+            deps.add(descriptorFile);
+            XmlUtil.processXmlElements(
+              descriptorFile,
+              processor,
+              true
+            );
+          }
         }
-        if (descriptorFile != null &&
-            !descriptorFile.getName().equals(((XmlFile)targetElement).getName() + ".dtd")) {
-          deps.add(descriptorFile);
-          XmlUtil.processXmlElements(
-            descriptorFile,
-            processor,
-            true
-          );
-        }
-      }
 
-      return new CachedValueProvider.Result<XmlEntityDecl>(result[0], ArrayUtil.toObjectArray(deps));
-    }
-    finally {
-      targetElement.putUserData(EVALUATION_IN_PROCESS, null);
-    }
+        return new CachedValueProvider.Result<XmlEntityDecl>(result[0], ArrayUtil.toObjectArray(deps));
+      }
+    });
   }
 
   private static String getDtdForEntity(XmlDoctype xmlDoctype) {
@@ -214,7 +214,7 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef {
   @Override
   @NotNull
   public PsiReference[] getReferences() {
-    return ReferenceProvidersRegistry.getReferencesFromProviders(this,XmlEntityRef.class);
+    return ReferenceProvidersRegistry.getReferencesFromProviders(this);
   }
 
   @Override

From 541d42ae4647ffd9d501c929f1010222f36f25e9 Mon Sep 17 00:00:00 2001
From: Liana Bakradze <liana.bakradze@jetbrains.com>
Date: Mon, 27 Oct 2014 19:06:42 +0300
Subject: [PATCH 104/132] EDU-254 Change course information: invalid case

---
 .../plugins/coursecreator/actions/CCChangeCourseInfo.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java
index 0f3b3ae4a092..ffb777e1a050 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java
@@ -20,7 +20,7 @@ import javax.swing.*;
 
 public class CCChangeCourseInfo extends DumbAwareAction {
   public CCChangeCourseInfo() {
-    super("Change course information", "Change course information", null);
+    super("Change Course information", "Change Course Information", null);
   }
 
   @Override

From 92d39f1832e40fc4015e8ada1ff87ec179399753 Mon Sep 17 00:00:00 2001
From: Liana Bakradze <liana.bakradze@jetbrains.com>
Date: Mon, 27 Oct 2014 19:28:54 +0300
Subject: [PATCH 105/132] EDU-255 Change course information: course name in
 project view is not updated

---
 .../plugins/coursecreator/actions/CCChangeCourseInfo.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java
index ffb777e1a050..a556cd1113f1 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java
@@ -1,6 +1,7 @@
 package org.jetbrains.plugins.coursecreator.actions;
 
 import com.intellij.ide.IdeView;
+import com.intellij.ide.projectView.ProjectView;
 import com.intellij.ide.util.DirectoryChooserUtil;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -85,6 +86,7 @@ public class CCChangeCourseInfo extends DumbAwareAction {
       course.setAuthor(panel.getAuthor());
       course.setName(panel.getName());
       course.setDescription(panel.getDescription());
+      ProjectView.getInstance(project).refresh();
     }
   }
 
@@ -93,6 +95,7 @@ public class CCChangeCourseInfo extends DumbAwareAction {
     CCNewProjectPanel myNewProjectPanel;
     public ChangeCourseInfoDialog(@Nullable Project project, CCNewProjectPanel panel) {
       super(project);
+      setTitle("Change Course Information");
       myNewProjectPanel = panel;
       init();
     }

From 44ea42deaf1fe24c9738387ac330b37e92b0bc64 Mon Sep 17 00:00:00 2001
From: Sergey Simonchik <sergey.simonchik@jetbrains.com>
Date: Mon, 27 Oct 2014 19:44:25 +0400
Subject: [PATCH 106/132] adding a new ExtensionFileNameMatcher should
 re-assign file type for files previously associated with ExactFileNameMatcher

---
 .../fileTypes/impl/FileTypeManagerImpl.java   | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
index 37e9dc583628..1891e59711bd 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
@@ -358,8 +358,10 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME
     for (final StandardFileType pair : myStandardFileTypes.values()) {
       registerFileTypeWithoutNotification(pair.fileType, pair.matchers);
     }
-    for (StandardFileType pair : myStandardFileTypes.values()) {
-      registerReDetectedMappings(pair);
+    if (!myUnresolvedMappings.isEmpty()) {
+      for (StandardFileType pair : myStandardFileTypes.values()) {
+        registerReDetectedMappings(pair);
+      }
     }
     // Resolve unresolved mappings initialized before certain plugin initialized.
     for (final StandardFileType pair : myStandardFileTypes.values()) {
@@ -1297,14 +1299,23 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME
     FileType fileType = pair.fileType;
     if (fileType == PlainTextFileType.INSTANCE) return;
     for (FileNameMatcher matcher : pair.matchers) {
-      String typeName = myUnresolvedMappings.get(matcher);
-      if (typeName != null && !typeName.equals(fileType.getName())) {
-        Trinity<String, String, Boolean> trinity = myUnresolvedRemovedMappings.get(matcher);
-        myRemovedMappings.put(matcher, Pair.create(fileType, trinity != null && trinity.third));
+      registerReDetectedMapping(fileType, matcher);
+      if (matcher instanceof ExtensionFileNameMatcher) {
+        // also check exact file name matcher
+        ExtensionFileNameMatcher extMatcher = (ExtensionFileNameMatcher)matcher;
+        registerReDetectedMapping(fileType, new ExactFileNameMatcher("." + extMatcher.getExtension()));
       }
     }
   }
 
+  private void registerReDetectedMapping(@NotNull FileType fileType, @NotNull FileNameMatcher matcher) {
+    String typeName = myUnresolvedMappings.get(matcher);
+    if (typeName != null && !typeName.equals(fileType.getName())) {
+      Trinity<String, String, Boolean> trinity = myUnresolvedRemovedMappings.get(matcher);
+      myRemovedMappings.put(matcher, Pair.create(fileType, trinity != null && trinity.third));
+    }
+  }
+
   Map<FileNameMatcher, Pair<FileType, Boolean>> getRemovedMappings() {
     return myRemovedMappings;
   }

From 0c4529fb6eccf4b967a958a53332eb2680424453 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 27 Oct 2014 16:44:32 +0100
Subject: [PATCH 107/132] unnecessary unboxing: search for overloads in correct
 container (IDEA-131911)

---
 .../UnnecessaryUnboxingInspection.java        | 55 +++++++++++--------
 .../UnnecessaryUnboxing.java                  | 15 +++++
 .../UnnecessaryUnboxing.java                  | 13 +++++
 .../unnecessary_unboxing/expected.xml         |  7 ++-
 4 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java
index 9118a798f612..3da2504df69a 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
+import com.intellij.refactoring.util.RefactoringChangeUtil;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
@@ -243,12 +244,9 @@ public class UnnecessaryUnboxingInspection extends BaseInspection {
       if (!(expression instanceof PsiMethodCallExpression)) {
         return false;
       }
-      final PsiMethodCallExpression methodCallExpression =
-        (PsiMethodCallExpression)expression;
-      final PsiReferenceExpression methodExpression =
-        methodCallExpression.getMethodExpression();
-      final PsiExpression qualifier =
-        methodExpression.getQualifierExpression();
+      final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression;
+      final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression();
+      final PsiExpression qualifier = methodExpression.getQualifierExpression();
       if (qualifier == null) {
         return false;
       }
@@ -261,31 +259,45 @@ public class UnnecessaryUnboxingInspection extends BaseInspection {
         return false;
       }
       final String methodName = methodExpression.getReferenceName();
-      final String unboxingMethod =
-        s_unboxingMethods.get(qualifierTypeName);
+      final String unboxingMethod = s_unboxingMethods.get(qualifierTypeName);
       return unboxingMethod.equals(methodName);
     }
 
-    private boolean isSameMethodCalledWithoutUnboxing(
-      @NotNull PsiCallExpression callExpression,
-      @NotNull PsiMethodCallExpression unboxingExpression) {
-      final PsiExpressionList argumentList =
-        callExpression.getArgumentList();
+    private boolean isSameMethodCalledWithoutUnboxing(@NotNull PsiCallExpression callExpression,
+                                                      @NotNull PsiMethodCallExpression unboxingExpression) {
+      final PsiExpressionList argumentList = callExpression.getArgumentList();
       if (argumentList == null) {
         return false;
       }
       final PsiExpression[] expressions = argumentList.getExpressions();
-      final PsiMethod originalMethod =
-        callExpression.resolveMethod();
+      final PsiMethod originalMethod = callExpression.resolveMethod();
       if (originalMethod == null) {
         return false;
       }
       final String name = originalMethod.getName();
-      final PsiClass containingClass =
-        originalMethod.getContainingClass();
+
+      final PsiExpression qualifierExpression;
+      if (callExpression instanceof PsiMethodCallExpression) {
+        qualifierExpression = ((PsiMethodCallExpression)callExpression).getMethodExpression().getQualifierExpression();
+      } else if (callExpression instanceof PsiNewExpression) {
+        qualifierExpression = ((PsiNewExpression)callExpression).getQualifier();
+      } else {
+        return false;
+      }
+
+      final PsiClass containingClass;
+      if (qualifierExpression == null) {
+        final PsiElement scope = callExpression.resolveMethodGenerics().getCurrentFileResolveScope();
+        containingClass = scope instanceof PsiClass ? (PsiClass)scope : null;
+      }
+      else {
+        containingClass = PsiUtil.resolveClassInType(GenericsUtil.getVariableTypeByExpressionType(qualifierExpression.getType()));
+      }
+
       if (containingClass == null) {
         return false;
       }
+
       final PsiType[] types = PsiType.createArray(expressions.length);
       for (int i = 0; i < expressions.length; i++) {
         final PsiExpression expression = expressions[i];
@@ -294,20 +306,17 @@ public class UnnecessaryUnboxingInspection extends BaseInspection {
           if (!(type instanceof PsiPrimitiveType)) {
             return false;
           }
-          final PsiPrimitiveType primitiveType =
-            (PsiPrimitiveType)type;
+          final PsiPrimitiveType primitiveType = (PsiPrimitiveType)type;
           types[i] = primitiveType.getBoxedType(unboxingExpression);
         }
         else {
           types[i] = type;
         }
       }
-      final PsiMethod[] methods =
-        containingClass.findMethodsByName(name, true);
+      final PsiMethod[] methods = containingClass.findMethodsByName(name, true);
       for (final PsiMethod method : methods) {
         if (!originalMethod.equals(method)) {
-          if (MethodCallUtils.isApplicable(method,
-                                           PsiSubstitutor.EMPTY, types)) {
+          if (MethodCallUtils.isApplicable(method, PsiSubstitutor.EMPTY, types)) {
             return false;
           }
         }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_superfluous_unboxing/UnnecessaryUnboxing.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_superfluous_unboxing/UnnecessaryUnboxing.java
index 96d22a045a7a..e2a096e059ca 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_superfluous_unboxing/UnnecessaryUnboxing.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_superfluous_unboxing/UnnecessaryUnboxing.java
@@ -38,4 +38,19 @@ public class UnnecessaryUnboxing {
     Integer boxcutter(Integer i) {
       return i.intValue();
     }
+}
+
+
+class B23 {
+    public void set(double value) {}
+}
+class A23 extends B23 {
+    public void set(Object value) {}
+    private A23() {
+        Object o = 2d;
+        set(((Double) o).doubleValue());
+
+        B23 b23 = new B23();
+        b23.set(((Double) o).doubleValue());
+    }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/UnnecessaryUnboxing.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/UnnecessaryUnboxing.java
index 366d21ddbae8..414960e321d6 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/UnnecessaryUnboxing.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/UnnecessaryUnboxing.java
@@ -43,4 +43,17 @@ public class UnnecessaryUnboxing {
     byte cast(Integer v) {
        return (byte)v.intValue();
     }
+}
+
+
+class B23 {
+    public void set(double value) {}
+}
+class A23 extends B23 {
+    public void set(Object value) {}
+    private A23() {
+        Object o = 2d;
+        B23 b23 = new B23();
+        b23.set(((Double) o).doubleValue());
+    }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/expected.xml
index 35c78be16577..d208b3f7867a 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/expected.xml
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/expected.xml
@@ -55,5 +55,10 @@
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Unnecessary unboxing</problem_class>
     <description>Unnecessary unboxing &lt;code&gt;b.byteValue()&lt;/code&gt; #loc</description>
   </problem>
-
+  <problem>
+    <file>UnnecessaryUnboxing.java</file>
+    <line>57</line>
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Unnecessary unboxing</problem_class>
+    <description>Unnecessary unboxing &lt;code&gt;((Double) o).doubleValue()&lt;/code&gt; #loc</description>
+  </problem>
 </problems>
\ No newline at end of file

From 657c1243cb5ed4896eacf54015af3b63c83310d4 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Mon, 27 Oct 2014 20:10:59 +0300
Subject: [PATCH 108/132] IDEA-125176 Check that token is not empty before
 trying to update boards

Also add diagnostic records to log and remove debug dumping of formatted responses
(this data may be retrieved using standard httpclient logs).
---
 .../com/intellij/tasks/trello/TrelloRepository.java   |  3 ---
 .../intellij/tasks/trello/TrelloRepositoryEditor.java | 11 ++++++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java
index eafe341d3989..8ea6b8618d71 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java
@@ -26,7 +26,6 @@ import com.intellij.tasks.TaskBundle;
 import com.intellij.tasks.TaskRepositoryType;
 import com.intellij.tasks.impl.BaseRepository;
 import com.intellij.tasks.impl.BaseRepositoryImpl;
-import com.intellij.tasks.impl.TaskUtil;
 import com.intellij.tasks.impl.httpclient.ResponseUtil;
 import com.intellij.tasks.trello.model.TrelloBoard;
 import com.intellij.tasks.trello.model.TrelloCard;
@@ -320,8 +319,6 @@ public final class TrelloRepository extends BaseRepositoryImpl {
     HttpClient client = getHttpClient();
     client.executeMethod(method);
     String entityContent = ResponseUtil.getResponseContentAsString(method);
-    TaskUtil.prettyFormatJsonToLog(LOG, entityContent);
-    // LOG.debug("Response size: " + method.getResponseHeader("Content-Length").getValue() + " bytes");
     if (method.getStatusCode() != HttpStatus.SC_OK) {
       Header header = method.getResponseHeader("Content-Type");
       if (header != null && header.getValue().startsWith("text/plain")) {
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepositoryEditor.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepositoryEditor.java
index 31584497f43a..3ad4b12de380 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepositoryEditor.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepositoryEditor.java
@@ -43,7 +43,7 @@ import java.util.List;
  * @author Mikhail Golubev
  */
 public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepository> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.tasks.trello.TrelloRepositoryEditor");
+  private static final Logger LOG = Logger.getInstance(TrelloRepositoryEditor.class);
 
   private static final TrelloBoard UNSPECIFIED_BOARD = new TrelloBoard() {
     @NotNull
@@ -83,9 +83,10 @@ public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepositor
       @Override
       protected void textChanged(DocumentEvent e) {
         String password = String.valueOf(myPasswordText.getPassword());
-        if (password.equals(myRepository.getPassword())) {
+        if (password.isEmpty() || password.equals(myRepository.getPassword())) {
           return;
         }
+        LOG.debug("Authentication token was changed");
         myRepository.setPassword(password);
         new BoardsDownloader(UNSPECIFIED_BOARD) {
           @Override
@@ -119,7 +120,6 @@ public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepositor
       }
     });
     myBoardComboBox.setRenderer(new TrelloBoardRenderer("Set token first"));
-    myListComboBox.setRenderer(new TrelloListRenderer("Select board first"));
 
     myListComboBox.addItemListener(new ItemListener() {
       @Override
@@ -132,12 +132,14 @@ public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepositor
         }
       }
     });
+    myListComboBox.setRenderer(new TrelloListRenderer("Select board first"));
 
     // Initial setup:
     if (myRepository.getCurrentUser() != null) {
       new BoardsDownloader(myRepository.getCurrentBoard()) {
         @Override
         protected List<TrelloBoard> download() throws Exception {
+          LOG.debug("Updating information about boards available to user when repository setting are shown");
           List<TrelloBoard> boards = super.download();
           if (myBoard == null) {
             return boards;
@@ -157,6 +159,7 @@ public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepositor
       new ListsDownloader(myRepository.getCurrentList()) {
         @Override
         protected List<TrelloList> download() throws Exception {
+          LOG.debug("Updating information about lists of board " + myRepository.getCurrentBoard() + " when repository setting are shown");
           List<TrelloList> lists = super.download();
           if (myList == null) {
             return lists;
@@ -266,6 +269,7 @@ public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepositor
       return myRepository.fetchUserBoards();
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     protected void updateUI(List<TrelloBoard> boards) {
       myBoardComboBox.setModel(new DefaultComboBoxModel(boards.toArray()));
@@ -296,6 +300,7 @@ public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepositor
       return myRepository.fetchBoardLists();
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     protected void updateUI(List<TrelloList> lists) {
       myListComboBox.setModel(new DefaultComboBoxModel(lists.toArray()));

From 9e87820daa75ed0dfad291cb3d4257e86d31dca5 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 27 Oct 2014 19:47:22 +0300
Subject: [PATCH 109/132] IDEA-131931 Debugger: Throwable at
 SuspendContextImpl.getDebugProcess() on opening Referring Objects dialog from
 itself

---
 .../com/intellij/debugger/engine/JavaValue.java    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
index 6ea0b626cd00..9cba64ac544a 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
@@ -70,6 +70,7 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
   private final EvaluationContextImpl myEvaluationContext;
   private final NodeManagerImpl myNodeManager;
   private final boolean myContextSet;
+  private final DebuggerManagerThreadImpl myDebuggerManagerThread;
 
   protected JavaValue(JavaValue parent,
                     @NotNull ValueDescriptorImpl valueDescriptor,
@@ -82,6 +83,7 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
     myEvaluationContext = evaluationContext;
     myNodeManager = nodeManager;
     myContextSet = contextSet;
+    myDebuggerManagerThread = evaluationContext.getDebugProcess().getManagerThread();
   }
 
   static JavaValue create(JavaValue parent,
@@ -353,7 +355,11 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
   }
 
   boolean scheduleCommand(SuspendContextCommandImpl command) {
-    return scheduleCommand(myEvaluationContext, null, command);
+    if (myEvaluationContext.getSuspendContext().isResumed()) {
+      return false;
+    }
+    myDebuggerManagerThread.schedule(command);
+    return true;
   }
 
   protected static boolean scheduleCommand(EvaluationContextImpl evaluationContext,
@@ -490,6 +496,7 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
   @Nullable
   @Override
   public XReferrersProvider getReferrersProvider() {
+    if (myEvaluationContext.getSuspendContext().isResumed()) return null;
     return new XReferrersProvider() {
       @Override
       public XValue getReferringObjectsValue() {
@@ -501,16 +508,15 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
   @Nullable
   @Override
   public XInstanceEvaluator getInstanceEvaluator() {
-    final DebugProcessImpl process = myEvaluationContext.getDebugProcess();
     return new XInstanceEvaluator() {
       @Override
       public void evaluate(@NotNull final XDebuggerEvaluator.XEvaluationCallback callback, @NotNull final XStackFrame frame) {
-        process.getManagerThread().schedule(new DebuggerCommandImpl() {
+        myDebuggerManagerThread.schedule(new DebuggerCommandImpl() {
           @Override
           protected void action() throws Exception {
             ValueDescriptorImpl inspectDescriptor = myValueDescriptor;
             if (myValueDescriptor instanceof WatchItemDescriptor) {
-              inspectDescriptor = (ValueDescriptorImpl) ((WatchItemDescriptor) myValueDescriptor).getModifier().getInspectItem(getProject());
+              inspectDescriptor = (ValueDescriptorImpl)((WatchItemDescriptor)myValueDescriptor).getModifier().getInspectItem(getProject());
             }
             EvaluationContextImpl evaluationContext = ((JavaStackFrame)frame).getFrameDebuggerContext().createEvaluationContext();
             if (evaluationContext != null) {

From fd9ead508c5842a65ac57374ad8323dbf5afb505 Mon Sep 17 00:00:00 2001
From: Michael Golubev <michael.golubev@jetbrains.com>
Date: Mon, 27 Oct 2014 17:32:49 +0100
Subject: [PATCH 110/132] IDEA-131963 - Redesign application servers view
 actions

---
 .../impl/src/META-INF/RemoteServers.xml       |  14 +-
 .../runtime/ui/ServersToolWindowContent.java  |  29 +---
 .../impl/runtime/ui/tree/DeploymentNode.java  |  16 +-
 .../impl/runtime/ui/tree/ServerNode.java      |  19 +--
 .../impl/runtime/ui/tree/ServersTreeNode.java |  20 +++
 .../runtime/ui/tree/ServersTreeStructure.java | 152 +++++++++---------
 .../tree/actions/ChooseDeploymentAction.java  |  39 +++++
 .../ChooseDeploymentWithDebugAction.java      |  39 +++++
 .../ui/tree/actions/DebugServerAction.java    |  19 ---
 .../runtime/ui/tree/actions/DeployAction.java |  63 +++-----
 .../ui/tree/actions/DeployAllAction.java      |  27 ----
 .../tree/actions/DeployWithDebugAction.java   |  46 ++++++
 .../ui/tree/actions/DeploymentActionBase.java |  52 ------
 .../tree/actions/DeploymentConfigAction.java  |  40 +++++
 .../tree/actions/EditConfigurationAction.java |  42 -----
 .../actions/EditConfigurationActionBase.java  |  26 +++
 .../actions/RemoteServerConfigAction.java     |  35 ++++
 .../actions/RemoteServerConnectAction.java    |  42 +++++
 .../actions/RemoteServerDisconnectAction.java |  46 ++++++
 .../ui/tree/actions/RunServerAction.java      |  20 ---
 .../ui/tree/actions/RunServerActionBase.java  |  31 ----
 .../ui/tree/actions/ServerActionBase.java     |  46 ------
 .../ui/tree/actions/ServersTreeAction.java    |  91 +++++++++++
 .../tree/actions/ServersTreeActionBase.java   |  44 -----
 .../tree/actions/SingleServerActionBase.java  |  49 ------
 .../ui/tree/actions/StopServerAction.java     |  26 ---
 .../ui/tree/actions/UndeployAction.java       |  21 ++-
 27 files changed, 560 insertions(+), 534 deletions(-)
 create mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeNode.java
 create mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentAction.java
 create mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentWithDebugAction.java
 delete mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DebugServerAction.java
 delete mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAllAction.java
 create mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployWithDebugAction.java
 delete mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentActionBase.java
 create mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentConfigAction.java
 delete mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationAction.java
 create mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationActionBase.java
 create mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConfigAction.java
 create mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConnectAction.java
 create mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerDisconnectAction.java
 delete mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerAction.java
 delete mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerActionBase.java
 delete mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServerActionBase.java
 create mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeAction.java
 delete mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeActionBase.java
 delete mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/SingleServerActionBase.java
 delete mode 100644 platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/StopServerAction.java

diff --git a/platform/remote-servers/impl/src/META-INF/RemoteServers.xml b/platform/remote-servers/impl/src/META-INF/RemoteServers.xml
index 0ce5eae571a9..eae970f46594 100644
--- a/platform/remote-servers/impl/src/META-INF/RemoteServers.xml
+++ b/platform/remote-servers/impl/src/META-INF/RemoteServers.xml
@@ -38,14 +38,16 @@
 
   <actions>
     <group id="RemoteServersViewToolbar">
-      <action id="RemoteServers.RunServer" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.RunServerAction"/>
-      <action id="RemoteServers.DebugServer" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.DebugServerAction"/>
-      <action id="RemoteServers.StopServer" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.StopServerAction"/>
-      <action id="RemoteServers.EditServer" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.EditConfigurationAction"/>
-      <separator/>
-      <action id="RemoteServers.DeployAll" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.DeployAllAction"/>
+      <action id="RemoteServers.ConnectServer" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.RemoteServerConnectAction"/>
+      <action id="RemoteServers.DisconnectServer" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.RemoteServerDisconnectAction"/>
+      <action id="RemoteServers.EditServerConfig" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.RemoteServerConfigAction"/>
+      <action id="RemoteServers.ChooseServerDeployment" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.ChooseDeploymentAction"/>
+      <action id="RemoteServers.ChooseServerDeploymentWithDebug" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.ChooseDeploymentWithDebugAction"/>
+
       <action id="Servers.Deploy" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.DeployAction"/>
       <action id="Servers.Undeploy" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.UndeployAction"/>
+      <action id="Servers.DeployWithDebug" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.DeployWithDebugAction"/>
+      <action id="RemoteServers.EditDeploymentConfig" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.DeploymentConfigAction"/>
     </group>
   </actions>
 </idea-plugin>
\ No newline at end of file
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/ServersToolWindowContent.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/ServersToolWindowContent.java
index 8a46887be6cf..2d3fb8cc1b86 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/ServersToolWindowContent.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/ServersToolWindowContent.java
@@ -6,18 +6,16 @@ import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.ide.util.treeView.NodeDescriptor;
 import com.intellij.ide.util.treeView.NodeRenderer;
 import com.intellij.ide.util.treeView.TreeVisitor;
-import com.intellij.openapi.application.ModalityState;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.remoteServer.configuration.RemoteServer;
 import com.intellij.remoteServer.impl.runtime.log.LoggingHandlerImpl;
-import com.intellij.remoteServer.impl.runtime.ui.tree.DeploymentNode;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
 import com.intellij.remoteServer.impl.runtime.ui.tree.TreeBuilderBase;
 import com.intellij.remoteServer.runtime.ConnectionStatus;
 import com.intellij.remoteServer.runtime.ServerConnection;
@@ -108,13 +106,10 @@ public class ServersToolWindowContent extends JPanel implements Disposable {
     new DoubleClickListener() {
       @Override
       protected boolean onDoubleClick(MouseEvent event) {
-        Set<ServersTreeStructure.RemoteServerNode> nodes = getSelectedRemoteServerNodes();
-        if (nodes.size() == 1) {
-          RemoteServer<?> server = nodes.iterator().next().getValue();
-          ServerConnectionManager.getInstance().getOrCreateConnection(server);
-          return true;
-        }
-        return false;
+        AnAction connectAction = ActionManager.getInstance().getAction("RemoteServers.ConnectServer");
+        AnActionEvent actionEvent = AnActionEvent.createFromInputEvent(connectAction, event, ActionPlaces.UNKNOWN);
+        connectAction.actionPerformed(actionEvent);
+        return true;
       }
     }.installOn(myTree);
   }
@@ -265,18 +260,6 @@ public class ServersToolWindowContent extends JPanel implements Disposable {
     return this;
   }
 
-  public Set<ServerNode> getSelectedServerNodes() {
-    return myBuilder.getSelectedElements(ServerNode.class);
-  }
-
-  public Set<DeploymentNode> getSelectedDeploymentNodes() {
-    return myBuilder.getSelectedElements(DeploymentNode.class);
-  }
-
-  public Set<ServersTreeStructure.RemoteServerNode> getSelectedRemoteServerNodes() {
-    return myBuilder.getSelectedElements(ServersTreeStructure.RemoteServerNode.class);
-  }
-
   @Override
   public void dispose() {
   }
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/DeploymentNode.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/DeploymentNode.java
index d859d61b7f3e..b147ee72df6c 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/DeploymentNode.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/DeploymentNode.java
@@ -5,18 +5,24 @@ import org.jetbrains.annotations.NotNull;
 /**
  * @author nik
  */
-public interface DeploymentNode {
+public interface DeploymentNode extends ServersTreeNode {
+
   @NotNull
   ServerNode getServerNode();
 
-  boolean isRedeployActionEnabled();
-  void redeploy();
+  boolean isDeployActionVisible();
+
+  boolean isDeployActionEnabled();
+
+  void deploy();
 
   boolean isUndeployActionEnabled();
+
   void undeploy();
 
-  boolean isEditConfigurationActionEnabled();
-  void editConfiguration();
+  boolean isDebugActionVisible();
+
+  void deployWithDebug();
 
   boolean isDeployed();
 
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServerNode.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServerNode.java
index d17a730002fb..d3d160cff2e3 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServerNode.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServerNode.java
@@ -1,26 +1,9 @@
 package com.intellij.remoteServer.impl.runtime.ui.tree;
 
-import com.intellij.execution.Executor;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import org.jetbrains.annotations.NotNull;
-
 /**
  * @author nik
  */
-public interface ServerNode {
-  boolean isConnected();
 
-  boolean isStopActionEnabled();
-  void stopServer();
+public interface ServerNode extends ServersTreeNode {
 
-  boolean isStartActionEnabled(@NotNull Executor executor);
-  void startServer(@NotNull Executor executor);
-
-  boolean isDeployActionEnabled();
-  void deploy(AnActionEvent e);
-
-  boolean isDeployAllActionEnabled();
-  void deployAll();
-
-  void editConfiguration();
 }
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeNode.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeNode.java
new file mode 100644
index 000000000000..84cd735aaba6
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeNode.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.remoteServer.impl.runtime.ui.tree;
+
+public interface ServersTreeNode {
+
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeStructure.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeStructure.java
index 7a2a053779d5..5f1969ecbea3 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeStructure.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeStructure.java
@@ -3,6 +3,7 @@ package com.intellij.remoteServer.impl.runtime.ui.tree;
 import com.intellij.execution.Executor;
 import com.intellij.execution.ProgramRunnerUtil;
 import com.intellij.execution.RunnerAndConfigurationSettings;
+import com.intellij.execution.executors.DefaultDebugExecutor;
 import com.intellij.execution.executors.DefaultRunExecutor;
 import com.intellij.execution.impl.RunDialog;
 import com.intellij.execution.runners.ExecutionEnvironment;
@@ -18,13 +19,16 @@ import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.ListPopup;
 import com.intellij.openapi.ui.popup.PopupStep;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
+import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.remoteServer.ServerType;
 import com.intellij.remoteServer.configuration.RemoteServer;
 import com.intellij.remoteServer.configuration.RemoteServersManager;
 import com.intellij.remoteServer.configuration.ServerConfiguration;
 import com.intellij.remoteServer.configuration.deployment.DeploymentConfigurationManager;
 import com.intellij.remoteServer.impl.configuration.SingleRemoteServerConfigurable;
+import com.intellij.remoteServer.impl.configuration.deployment.DeployToServerRunConfiguration;
 import com.intellij.remoteServer.impl.runtime.deployment.DeploymentTaskImpl;
 import com.intellij.remoteServer.impl.runtime.log.DeploymentLogManagerImpl;
 import com.intellij.remoteServer.impl.runtime.log.LoggingHandlerImpl;
@@ -38,6 +42,7 @@ import com.intellij.remoteServer.runtime.deployment.DeploymentStatus;
 import com.intellij.remoteServer.runtime.deployment.DeploymentTask;
 import com.intellij.ui.LayeredIcon;
 import com.intellij.ui.awt.RelativePoint;
+import com.intellij.util.containers.ContainerUtil;
 import icons.RemoteServersIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -160,50 +165,65 @@ public class ServersTreeStructure extends AbstractTreeStructureBase {
       return ServerConnectionManager.getInstance().getConnection(getValue());
     }
 
-    @Override
     public boolean isConnected() {
       ServerConnection<?> connection = getConnection();
       return connection != null && connection.getStatus() == ConnectionStatus.CONNECTED;
     }
 
-    @Override
-    public boolean isDeployActionEnabled() {
-      return true;
+    public void deploy(AnActionEvent e) {
+      doDeploy(e, DefaultRunExecutor.getRunExecutorInstance(), "Deploy Configuration", true);
     }
 
-    @Override
-    public void deploy(AnActionEvent e) {
-      final ServerType<? extends ServerConfiguration> serverType = getValue().getType();
+    public void deployWithDebug(AnActionEvent e) {
+      doDeploy(e, DefaultDebugExecutor.getDebugExecutorInstance(), "Deploy and Debug Configuration", false);
+    }
+
+    public void doDeploy(AnActionEvent e, final Executor executor, String popupTitle, boolean canCreate) {
+      final RemoteServer<?> server = getValue();
+      final ServerType<? extends ServerConfiguration> serverType = server.getType();
       final DeploymentConfigurationManager configurationManager = DeploymentConfigurationManager.getInstance(doGetProject());
-      List<RunnerAndConfigurationSettings> list = new ArrayList<RunnerAndConfigurationSettings>(configurationManager.getDeploymentConfigurations(serverType));
-      list.add(null);
-      ListPopup popup = JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep<RunnerAndConfigurationSettings>("Deploy Configuration", list) {
-        @Override
-        public Icon getIconFor(RunnerAndConfigurationSettings value) {
-          return value != null ? serverType.getIcon() : null;
-        }
+      List<RunnerAndConfigurationSettings> list
+        = ContainerUtil.filter(configurationManager.getDeploymentConfigurations(serverType),
+                               new Condition<RunnerAndConfigurationSettings>() {
 
-        @NotNull
-        @Override
-        public String getTextFor(RunnerAndConfigurationSettings value) {
-          return value != null ? value.getName() : "Create...";
-        }
+                                 @Override
+                                 public boolean value(RunnerAndConfigurationSettings settings) {
+                                   DeployToServerRunConfiguration configuration =
+                                     (DeployToServerRunConfiguration)settings.getConfiguration();
+                                   return StringUtil.equals(server.getName(), configuration.getServerName());
+                                 }
+                               });
+      if (canCreate) {
+        list.add(null);
+      }
+      ListPopup popup =
+        JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep<RunnerAndConfigurationSettings>(popupTitle, list) {
+          @Override
+          public Icon getIconFor(RunnerAndConfigurationSettings value) {
+            return value != null ? serverType.getIcon() : null;
+          }
 
-        @Override
-        public PopupStep onChosen(final RunnerAndConfigurationSettings selectedValue, boolean finalChoice) {
-          return doFinalStep(new Runnable() {
-            @Override
-            public void run() {
-              if (selectedValue != null) {
-                ProgramRunnerUtil.executeConfiguration(doGetProject(), selectedValue, DefaultRunExecutor.getRunExecutorInstance());
+          @NotNull
+          @Override
+          public String getTextFor(RunnerAndConfigurationSettings value) {
+            return value != null ? value.getName() : "Create...";
+          }
+
+          @Override
+          public PopupStep onChosen(final RunnerAndConfigurationSettings selectedValue, boolean finalChoice) {
+            return doFinalStep(new Runnable() {
+              @Override
+              public void run() {
+                if (selectedValue != null) {
+                  ProgramRunnerUtil.executeConfiguration(doGetProject(), selectedValue, executor);
+                }
+                else {
+                  configurationManager.createAndRunConfiguration(serverType, RemoteServerNode.this.getValue());
+                }
               }
-              else {
-                configurationManager.createAndRunConfiguration(serverType, RemoteServerNode.this.getValue());
-              }
-            }
-          });
-        }
-      });
+            });
+          }
+        });
       if (e.getInputEvent() instanceof MouseEvent) {
         popup.show(new RelativePoint((MouseEvent)e.getInputEvent()));
       }
@@ -212,45 +232,10 @@ public class ServersTreeStructure extends AbstractTreeStructureBase {
       }
     }
 
-    @Override
-    public boolean isStopActionEnabled() {
-      return isConnected();
-    }
-
-    @Override
-    public void stopServer() {
-      ServerConnection<?> connection = getConnection();
-      if (connection != null) {
-        connection.disconnect();
-      }
-    }
-
-    @Override
     public void editConfiguration() {
       ShowSettingsUtil.getInstance().editConfigurable(doGetProject(), new SingleRemoteServerConfigurable(getValue(), null, false));
     }
 
-    @Override
-    public boolean isStartActionEnabled(@NotNull Executor executor) {
-      ServerConnection connection = getConnection();
-      return executor.equals(DefaultRunExecutor.getRunExecutorInstance()) &&
-             (connection == null || connection.getStatus() == ConnectionStatus.DISCONNECTED);
-    }
-
-    @Override
-    public void startServer(@NotNull Executor executor) {
-      ServerConnectionManager.getInstance().getOrCreateConnection(getValue());
-    }
-
-    @Override
-    public boolean isDeployAllActionEnabled() {
-      return false;
-    }
-
-    @Override
-    public void deployAll() {
-    }
-
     @Nullable
     private Icon getStatusIcon(final ConnectionStatus status) {
       switch (status) {
@@ -278,23 +263,42 @@ public class ServersTreeStructure extends AbstractTreeStructureBase {
     }
 
     @Override
-    public boolean isRedeployActionEnabled() {
+    public boolean isDeployActionVisible() {
       DeploymentTask<?> deploymentTask = getValue().getDeploymentTask();
       return deploymentTask instanceof DeploymentTaskImpl<?> && ((DeploymentTaskImpl)deploymentTask).getExecutionEnvironment().getRunnerAndConfigurationSettings() != null;
     }
 
     @Override
-    public void redeploy() {
+    public boolean isDeployActionEnabled() {
+      return true;
+    }
+
+    @Override
+    public void deploy() {
+      doDeploy(DefaultRunExecutor.getRunExecutorInstance());
+    }
+
+    public void doDeploy(Executor executor) {
       DeploymentTask<?> deploymentTask = getValue().getDeploymentTask();
       if (deploymentTask != null) {
         ExecutionEnvironment environment = ((DeploymentTaskImpl)deploymentTask).getExecutionEnvironment();
         RunnerAndConfigurationSettings settings = environment.getRunnerAndConfigurationSettings();
         if (settings != null) {
-          ProgramRunnerUtil.executeConfiguration(doGetProject(), settings, DefaultRunExecutor.getRunExecutorInstance());
+          ProgramRunnerUtil.executeConfiguration(doGetProject(), settings, executor);
         }
       }
     }
 
+    @Override
+    public boolean isDebugActionVisible() {
+      return myParentNode.getValue().getType().createDebugConnector() != null;
+    }
+
+    @Override
+    public void deployWithDebug() {
+      doDeploy(DefaultDebugExecutor.getDebugExecutorInstance());
+    }
+
     @Override
     public boolean isUndeployActionEnabled() {
       DeploymentRuntime runtime = getValue().getRuntime();
@@ -309,12 +313,10 @@ public class ServersTreeStructure extends AbstractTreeStructureBase {
       }
     }
 
-    @Override
-    public boolean isEditConfigurationActionEnabled() {
+    public boolean isEditConfigurationActionVisible() {
       return getValue().getDeploymentTask() != null;
     }
 
-    @Override
     public void editConfiguration() {
       DeploymentTask<?> task = getValue().getDeploymentTask();
       if (task != null) {
@@ -396,7 +398,7 @@ public class ServersTreeStructure extends AbstractTreeStructureBase {
     }
   }
 
-  public class DeploymentLogNode extends AbstractTreeNode<Pair<LoggingHandlerImpl, String>> implements LogProvidingNode {
+  public class DeploymentLogNode extends AbstractTreeNode<Pair<LoggingHandlerImpl, String>> implements ServersTreeNode, LogProvidingNode {
     @NotNull private final DeploymentNodeImpl myDeploymentNode;
 
     public DeploymentLogNode(@NotNull Pair<LoggingHandlerImpl, String> value, @NotNull DeploymentNodeImpl deploymentNode) {
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentAction.java
new file mode 100644
index 000000000000..1a762f75cf01
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentAction.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
+import org.jetbrains.annotations.NotNull;
+
+public class ChooseDeploymentAction extends ServersTreeAction<ServersTreeStructure.RemoteServerNode> {
+
+  public ChooseDeploymentAction() {
+    super("Deploy", "Deploy a chosen item to the selected remote server", AllIcons.Nodes.Deploy);
+  }
+
+  @Override
+  protected Class<ServersTreeStructure.RemoteServerNode> getTargetNodeClass() {
+    return ServersTreeStructure.RemoteServerNode.class;
+  }
+
+  @Override
+  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e, ServersTreeStructure.RemoteServerNode node) {
+    node.deploy(e);
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentWithDebugAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentWithDebugAction.java
new file mode 100644
index 000000000000..55e2b1cb509f
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentWithDebugAction.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
+import org.jetbrains.annotations.NotNull;
+
+public class ChooseDeploymentWithDebugAction extends ServersTreeAction<ServersTreeStructure.RemoteServerNode> {
+
+  public ChooseDeploymentWithDebugAction() {
+    super("Debug", "Deploy and debug a chosen item on the selected remote server", AllIcons.Actions.StartDebugger);
+  }
+
+  @Override
+  protected Class<ServersTreeStructure.RemoteServerNode> getTargetNodeClass() {
+    return ServersTreeStructure.RemoteServerNode.class;
+  }
+
+  @Override
+  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e, ServersTreeStructure.RemoteServerNode node) {
+    node.deployWithDebug(e);
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DebugServerAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DebugServerAction.java
deleted file mode 100644
index f519478ef84c..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DebugServerAction.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.execution.Executor;
-import com.intellij.execution.executors.DefaultDebugExecutor;
-import com.intellij.icons.AllIcons;
-
-/**
- * @author michael.golubev
- */
-public class DebugServerAction extends RunServerActionBase {
-  public DebugServerAction() {
-    super("Debug", "Start the selected server in debug mode", AllIcons.Actions.StartDebugger);
-  }
-
-  @Override
-  protected Executor getExecutor() {
-    return DefaultDebugExecutor.getDebugExecutorInstance();
-  }
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAction.java
index c6a38404192e..4b8bbeeea7e7 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAction.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAction.java
@@ -1,67 +1,50 @@
 package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
 import com.intellij.remoteServer.impl.runtime.ui.tree.DeploymentNode;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Set;
-
 /**
  * @author michael.golubev
  */
-public class DeployAction extends ServersTreeActionBase {
+public class DeployAction extends ServersTreeAction<DeploymentNode> {
+
   public DeployAction() {
     super("Deploy", "Deploy the selected item", AllIcons.Nodes.Deploy);
   }
 
   @Override
-  protected void updatePresentation(@NotNull Presentation presentation, @Nullable ServersToolWindowContent content) {
-    if (content != null) {
-      Set<DeploymentNode> nodes = content.getSelectedDeploymentNodes();
-      if (nodes.size() == 1) {
-        DeploymentNode node = nodes.iterator().next();
-        if (node.isDeployed()) {
-          presentation.setText("Redeploy");
-          presentation.setDescription("Redeploy '" + node.getDeploymentName() + "'");
-          return;
-        }
-      }
-    }
-    presentation.setText(getTemplatePresentation().getText());
-    presentation.setDescription(getTemplatePresentation().getDescription());
+  protected Class<DeploymentNode> getTargetNodeClass() {
+    return DeploymentNode.class;
   }
 
   @Override
-  protected boolean isEnabled(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    Set<DeploymentNode> deploymentNodes = content.getSelectedDeploymentNodes();
-    Set<ServerNode> serverNodes = content.getSelectedServerNodes();
-    if (deploymentNodes.size() + serverNodes.size() != 1) return false;
-    for (DeploymentNode node : deploymentNodes) {
-      if (!node.isRedeployActionEnabled()) {
-        return false;
-      }
+  protected void updatePresentation(@NotNull Presentation presentation, @Nullable DeploymentNode node) {
+    if (node != null && node.isDeployed()) {
+      presentation.setText("Redeploy");
+      presentation.setDescription("Redeploy '" + node.getDeploymentName() + "'");
     }
-    for (ServerNode serverNode : serverNodes) {
-      if (!serverNode.isDeployActionEnabled()) {
-        return false;
-      }
+    else {
+      presentation.setText(getTemplatePresentation().getText());
+      presentation.setDescription(getTemplatePresentation().getDescription());
     }
-    return true;
   }
 
   @Override
-  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    for (DeploymentNode node : content.getSelectedDeploymentNodes()) {
-      node.redeploy();
-    }
-    for (ServerNode node : content.getSelectedServerNodes()) {
-      node.deploy(e);
-    }
+  protected boolean isVisible4(DeploymentNode node) {
+    return node.isDeployActionVisible();
+  }
+
+  @Override
+  protected boolean isEnabled4(DeploymentNode node) {
+    return node.isDeployActionEnabled();
+  }
+
+  @Override
+  protected void doActionPerformed(DeploymentNode node) {
+    node.deploy();
   }
 }
 
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAllAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAllAction.java
deleted file mode 100644
index 818f0ad7619e..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAllAction.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author michael.golubev
- */
-public class DeployAllAction extends ServerActionBase {
-
-  public DeployAllAction() {
-    super("Deploy All", "Deploy all the artifacts of the selected server", AllIcons.Nodes.Deploy);
-  }
-
-  @Override
-  protected void performAction(@NotNull ServerNode serverNode) {
-    if (serverNode.isDeployAllActionEnabled()) {
-      serverNode.deployAll();
-    }
-  }
-
-  @Override
-  protected boolean isEnabledForServer(@NotNull ServerNode serverNode) {
-    return serverNode.isDeployAllActionEnabled();
-  }
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployWithDebugAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployWithDebugAction.java
new file mode 100644
index 000000000000..d9c00380b9e2
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployWithDebugAction.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.remoteServer.impl.runtime.ui.tree.DeploymentNode;
+
+public class DeployWithDebugAction extends ServersTreeAction<DeploymentNode> {
+
+  public DeployWithDebugAction() {
+    super("Debug", "Deploy and debug the selected item", AllIcons.Actions.StartDebugger);
+  }
+
+  @Override
+  protected Class<DeploymentNode> getTargetNodeClass() {
+    return DeploymentNode.class;
+  }
+
+  @Override
+  protected boolean isVisible4(DeploymentNode node) {
+    return node.isDeployActionVisible() && node.isDebugActionVisible();
+  }
+
+  @Override
+  protected boolean isEnabled4(DeploymentNode node) {
+    return node.isDeployActionEnabled();
+  }
+
+  @Override
+  protected void doActionPerformed(DeploymentNode node) {
+    node.deployWithDebug();
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentActionBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentActionBase.java
deleted file mode 100644
index 27bace389c41..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentActionBase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
-import com.intellij.remoteServer.impl.runtime.ui.tree.DeploymentNode;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author nik
- */
-public abstract class DeploymentActionBase extends ServersTreeActionBase {
-  protected DeploymentActionBase(String text, String description, Icon icon) {
-    super(text, description, icon);
-  }
-
-  protected abstract void perform(@NotNull List<DeploymentNode> nodes, ServersToolWindowContent content, AnActionEvent e);
-
-  protected abstract boolean isApplicable(@NotNull DeploymentNode node);
-
-  @Override
-  public void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    List<DeploymentNode> toPerform = new ArrayList<DeploymentNode>();
-    for (DeploymentNode node : content.getSelectedDeploymentNodes()) {
-      if (isApplicable(node)) {
-        toPerform.add(node);
-      }
-    }
-    if (!toPerform.isEmpty()) {
-      perform(toPerform, content, e);
-    }
-  }
-
-  @Override
-  protected boolean isEnabled(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    Set<?> selectedElements = content.getBuilder().getSelectedElements();
-    if (selectedElements.isEmpty() || selectedElements.size() != content.getSelectedDeploymentNodes().size()) {
-      return false;
-    }
-
-    for (DeploymentNode node : content.getSelectedDeploymentNodes()) {
-      if (!isApplicable(node)) {
-        return false;
-      }
-    }
-    return true;
-  }
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentConfigAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentConfigAction.java
new file mode 100644
index 000000000000..e7f1960ae41f
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentConfigAction.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
+
+public class DeploymentConfigAction extends EditConfigurationActionBase<ServersTreeStructure.DeploymentNodeImpl> {
+
+  public DeploymentConfigAction() {
+    super("Edit the selected deployment run configuration");
+  }
+
+  @Override
+  protected Class<ServersTreeStructure.DeploymentNodeImpl> getTargetNodeClass() {
+    return ServersTreeStructure.DeploymentNodeImpl.class;
+  }
+
+  @Override
+  protected boolean isVisible4(ServersTreeStructure.DeploymentNodeImpl node) {
+    return node.isEditConfigurationActionVisible();
+  }
+
+  @Override
+  protected void doActionPerformed(ServersTreeStructure.DeploymentNodeImpl node) {
+    node.editConfiguration();
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationAction.java
deleted file mode 100644
index 75d22a854114..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
-import com.intellij.remoteServer.impl.runtime.ui.tree.DeploymentNode;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Set;
-
-/**
- * @author michael.golubev
- */
-public class EditConfigurationAction extends ServersTreeActionBase {
-  public EditConfigurationAction() {
-    super("Edit Configuration", "Edit configuration of the selected server", AllIcons.Actions.EditSource);
-  }
-
-  @Override
-  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    Set<DeploymentNode> deploymentNodes = content.getSelectedDeploymentNodes();
-    Set<ServerNode> serverNodes = content.getSelectedServerNodes();
-    if (deploymentNodes.size() == 1) {
-      deploymentNodes.iterator().next().editConfiguration();
-    }
-    else {
-      serverNodes.iterator().next().editConfiguration();
-    }
-  }
-
-  @Override
-  protected boolean isEnabled(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    Set<DeploymentNode> deploymentNodes = content.getSelectedDeploymentNodes();
-    Set<ServerNode> serverNodes = content.getSelectedServerNodes();
-    if (deploymentNodes.size() + serverNodes.size() != 1) return false;
-    if (deploymentNodes.size() == 1) {
-      return deploymentNodes.iterator().next().isEditConfigurationActionEnabled();
-    }
-    return true;
-  }
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationActionBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationActionBase.java
new file mode 100644
index 000000000000..05fcb95fede5
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationActionBase.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeNode;
+
+public abstract class EditConfigurationActionBase<T extends ServersTreeNode> extends ServersTreeAction<T> {
+
+  public EditConfigurationActionBase(String description) {
+    super("Edit Configuration", description, AllIcons.Actions.EditSource);
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConfigAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConfigAction.java
new file mode 100644
index 000000000000..b5f5456318da
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConfigAction.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
+
+public class RemoteServerConfigAction extends EditConfigurationActionBase<ServersTreeStructure.RemoteServerNode> {
+
+  public RemoteServerConfigAction() {
+    super("Edit the selected remote server configuration");
+  }
+
+  @Override
+  protected Class<ServersTreeStructure.RemoteServerNode> getTargetNodeClass() {
+    return ServersTreeStructure.RemoteServerNode.class;
+  }
+
+  @Override
+  protected void doActionPerformed(ServersTreeStructure.RemoteServerNode node) {
+    node.editConfiguration();
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConnectAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConnectAction.java
new file mode 100644
index 000000000000..8fd5f7891748
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConnectAction.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
+import com.intellij.remoteServer.runtime.ServerConnectionManager;
+
+public class RemoteServerConnectAction extends ServersTreeAction<ServersTreeStructure.RemoteServerNode> {
+
+  public RemoteServerConnectAction() {
+    super("Connect", "Connect to the selected remote server", AllIcons.Actions.Execute);
+  }
+
+  @Override
+  protected Class<ServersTreeStructure.RemoteServerNode> getTargetNodeClass() {
+    return ServersTreeStructure.RemoteServerNode.class;
+  }
+
+  @Override
+  protected boolean isEnabled4(ServersTreeStructure.RemoteServerNode node) {
+    return !node.isConnected();
+  }
+
+  @Override
+  protected void doActionPerformed(ServersTreeStructure.RemoteServerNode node) {
+    ServerConnectionManager.getInstance().getOrCreateConnection(node.getValue());
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerDisconnectAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerDisconnectAction.java
new file mode 100644
index 000000000000..96f21e56671f
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerDisconnectAction.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * 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.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
+import com.intellij.remoteServer.runtime.ServerConnection;
+import com.intellij.remoteServer.runtime.ServerConnectionManager;
+
+public class RemoteServerDisconnectAction extends ServersTreeAction<ServersTreeStructure.RemoteServerNode> {
+
+  public RemoteServerDisconnectAction() {
+    super("Disconnect", "Disconnect from the selected remote server", AllIcons.Actions.Suspend);
+  }
+
+  @Override
+  protected Class<ServersTreeStructure.RemoteServerNode> getTargetNodeClass() {
+    return ServersTreeStructure.RemoteServerNode.class;
+  }
+
+  @Override
+  protected boolean isEnabled4(ServersTreeStructure.RemoteServerNode node) {
+    return node.isConnected();
+  }
+
+  @Override
+  protected void doActionPerformed(ServersTreeStructure.RemoteServerNode node) {
+    ServerConnection<?> connection = ServerConnectionManager.getInstance().getConnection(node.getValue());
+    if (connection != null) {
+      connection.disconnect();
+    }
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerAction.java
deleted file mode 100644
index aa16c77e2aeb..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerAction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.execution.Executor;
-import com.intellij.execution.executors.DefaultRunExecutor;
-import com.intellij.icons.AllIcons;
-
-/**
- * @author michael.golubev
- */
-public class RunServerAction extends RunServerActionBase {
-
-  public RunServerAction() {
-    super("Run/Connect", "Run/Connect to the selected server", AllIcons.Actions.Execute);
-  }
-
-  @Override
-  protected Executor getExecutor() {
-    return DefaultRunExecutor.getRunExecutorInstance();
-  }
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerActionBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerActionBase.java
deleted file mode 100644
index 07b1e4b683f1..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerActionBase.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-
-import com.intellij.execution.Executor;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-
-/**
- * @author michael.golubev
- */
-public abstract class RunServerActionBase extends ServerActionBase {
-
-  protected RunServerActionBase(String text, String description, Icon icon) {
-    super(text, description, icon);
-  }
-
-  protected void performAction(@NotNull ServerNode serverNode) {
-    if (serverNode.isStartActionEnabled(getExecutor())) {
-      serverNode.startServer(getExecutor());
-    }
-  }
-
-  @Override
-  protected boolean isEnabledForServer(@NotNull ServerNode serverNode) {
-    return serverNode.isStartActionEnabled(getExecutor());
-  }
-
-  protected abstract Executor getExecutor();
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServerActionBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServerActionBase.java
deleted file mode 100644
index 1b4d4f8bbd89..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServerActionBase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.Set;
-
-/**
- * @author michael.golubev
- */
-public abstract class ServerActionBase extends ServersTreeActionBase {
-
-  protected ServerActionBase(String text, String description, Icon icon) {
-    super(text, description, icon);
-  }
-
-  @Override
-  protected final boolean isEnabled(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    Set<ServerNode> selectedServerNodes = content.getSelectedServerNodes();
-    Set<?> selectedElements = content.getBuilder().getSelectedElements();
-    if (selectedElements.size() != selectedServerNodes.size() || selectedElements.isEmpty()) {
-      return false;
-    }
-
-    for (ServerNode selectedServer : selectedServerNodes) {
-      if (!isEnabledForServer(selectedServer)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  @Override
-  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    for (ServerNode node : content.getSelectedServerNodes()) {
-      performAction(node);
-    }
-  }
-
-  protected abstract void performAction(@NotNull ServerNode serverNode);
-
-  protected abstract boolean isEnabledForServer(@NotNull ServerNode serverNode);
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeAction.java
new file mode 100644
index 000000000000..d86a708196d2
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeAction.java
@@ -0,0 +1,91 @@
+package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.Presentation;
+import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeNode;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import java.util.Set;
+
+public abstract class ServersTreeAction<T extends ServersTreeNode> extends AnAction {
+
+  protected ServersTreeAction(String text, String description, Icon icon) {
+    super(text, description, icon);
+  }
+
+  @Override
+  public void update(@NotNull AnActionEvent e) {
+    Presentation presentation = e.getPresentation();
+    T targetNode = getTargetNode(e);
+
+    boolean visible = false;
+    boolean enabled = false;
+
+    if (targetNode != null) {
+      visible = isVisible4(targetNode);
+      if (visible) {
+        enabled = isEnabled4(targetNode);
+      }
+    }
+
+    presentation.setVisible(visible);
+    presentation.setEnabled(enabled);
+    updatePresentation(presentation, targetNode);
+  }
+
+  private T getTargetNode(AnActionEvent e) {
+    ServersToolWindowContent content = getContent(e);
+    if (content == null) {
+      return null;
+    }
+    Set<Object> selectedElements = content.getBuilder().getSelectedElements();
+    if (selectedElements.size() != 1) {
+      return null;
+    }
+    ServersTreeNode node = (ServersTreeNode)selectedElements.iterator().next();
+    Class<T> targetNodeClass = getTargetNodeClass();
+    if (!targetNodeClass.isInstance(node)) {
+      return null;
+    }
+    return targetNodeClass.cast(node);
+  }
+
+  private static ServersToolWindowContent getContent(AnActionEvent e) {
+    return e.getData(ServersToolWindowContent.KEY);
+  }
+
+  @Override
+  public void actionPerformed(@NotNull AnActionEvent e) {
+    T targetNode = getTargetNode(e);
+    if (targetNode != null && isVisible4(targetNode) && isEnabled4(targetNode)) {
+      doActionPerformed(getContent(e), e, targetNode);
+    }
+  }
+
+
+  protected boolean isVisible4(T node) {
+    return true;
+  }
+
+  protected boolean isEnabled4(T node) {
+    return true;
+  }
+
+  protected void updatePresentation(@NotNull Presentation presentation, @Nullable T node) {
+  }
+
+
+  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e, T node) {
+    doActionPerformed(node);
+  }
+
+  protected void doActionPerformed(T node) {
+    throw new UnsupportedOperationException();
+  }
+
+  protected abstract Class<T> getTargetNodeClass();
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeActionBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeActionBase.java
deleted file mode 100644
index 7e505bd06aab..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeActionBase.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.openapi.actionSystem.Presentation;
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
-
-/**
- * @author michael.golubev
- */
-public abstract class ServersTreeActionBase extends AnAction {
-
-  protected ServersTreeActionBase(String text, String description, Icon icon) {
-    super(text, description, icon);
-  }
-
-  @Override
-  public void update(AnActionEvent e) {
-    ServersToolWindowContent content = e.getData(ServersToolWindowContent.KEY);
-    Presentation presentation = e.getPresentation();
-    presentation.setEnabled(content != null && isEnabled(content, e));
-    updatePresentation(presentation, content);
-  }
-
-  protected void updatePresentation(@NotNull Presentation presentation, @Nullable ServersToolWindowContent content) {
-  }
-
-  @Override
-  public void actionPerformed(AnActionEvent e) {
-    ServersToolWindowContent content = e.getData(ServersToolWindowContent.KEY);
-    if (content == null) {
-      return;
-    }
-    doActionPerformed(content, e);
-  }
-
-  protected abstract boolean isEnabled(@NotNull ServersToolWindowContent content, AnActionEvent e);
-
-  protected abstract void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e);
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/SingleServerActionBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/SingleServerActionBase.java
deleted file mode 100644
index 50ec63646922..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/SingleServerActionBase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * 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.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.Set;
-
-/**
- * @author michael.golubev
- */
-public abstract class SingleServerActionBase extends ServersTreeActionBase {
-  protected SingleServerActionBase(String text, String description, Icon icon) {
-    super(text, description, icon);
-  }
-
-  @Override
-  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    doActionPerformed(content, content.getSelectedServerNodes().iterator().next());
-  }
-
-  @Override
-  protected boolean isEnabled(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    Set<ServerNode> serverNodes = content.getSelectedServerNodes();
-    return content.getBuilder().getSelectedElements().size() == serverNodes.size() && serverNodes.size() == 1 &&
-           isEnabledForServer(serverNodes.iterator().next());
-  }
-
-  protected abstract boolean isEnabledForServer(ServerNode serverNode);
-
-  protected abstract void doActionPerformed(@NotNull ServersToolWindowContent content, @NotNull ServerNode server);
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/StopServerAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/StopServerAction.java
deleted file mode 100644
index 7984c119036c..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/StopServerAction.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author michael.golubev
- */
-public class StopServerAction extends ServerActionBase {
-
-  public StopServerAction() {
-    super("Stop/Disconnect", "Stop/disconnect from the selected server", AllIcons.Actions.Suspend);
-  }
-
-  protected void performAction(@NotNull ServerNode serverNode) {
-    if (serverNode.isStopActionEnabled()) {
-      serverNode.stopServer();
-    }
-  }
-
-  @Override
-  protected boolean isEnabledForServer(@NotNull ServerNode serverNode) {
-    return serverNode.isStopActionEnabled();
-  }
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/UndeployAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/UndeployAction.java
index bc11f8aa94a8..50c247eabd91 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/UndeployAction.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/UndeployAction.java
@@ -1,30 +1,29 @@
 package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
 import com.intellij.remoteServer.impl.runtime.ui.tree.DeploymentNode;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
 
 /**
  * @author michael.golubev
  */
-public class UndeployAction extends DeploymentActionBase {
+public class UndeployAction extends ServersTreeAction<DeploymentNode> {
+
   public UndeployAction() {
     super("Undeploy", "Undeploy the selected item", AllIcons.Nodes.Undeploy);
   }
 
   @Override
-  protected boolean isApplicable(@NotNull DeploymentNode node) {
+  protected Class<DeploymentNode> getTargetNodeClass() {
+    return DeploymentNode.class;
+  }
+
+  @Override
+  protected boolean isEnabled4(DeploymentNode node) {
     return node.isUndeployActionEnabled();
   }
 
   @Override
-  protected void perform(@NotNull List<DeploymentNode> nodes, ServersToolWindowContent content, AnActionEvent e) {
-    for (DeploymentNode node : nodes) {
-      node.undeploy();
-    }
+  protected void doActionPerformed(DeploymentNode node) {
+    node.undeploy();
   }
 }

From accd7e72c6af39326885ff2b0b90e3ee49b2653a Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Mon, 27 Oct 2014 20:28:55 +0300
Subject: [PATCH 111/132] fixed EDU-256 Do not show run selection menu on
 gutter icon if there is only one item to select

---
 .../actions/CCRunTestsAction.java             |  1 +
 .../edu/PyExecuteFileLineMarkerProvider.java  | 33 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCRunTestsAction.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCRunTestsAction.java
index 462678c477ad..777afc4e1a85 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCRunTestsAction.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCRunTestsAction.java
@@ -84,6 +84,7 @@ public class CCRunTestsAction extends AnAction {
     if (lessonDir == null) return;
     if (course == null) return;
     final Lesson lesson = course.getLesson(lessonDir.getName());
+    if (lesson == null) return;
     final Task task = lesson.getTask(taskDir.getName());
     if (task == null) {
       presentation.setVisible(false);
diff --git a/python/edu/src/com/jetbrains/python/edu/PyExecuteFileLineMarkerProvider.java b/python/edu/src/com/jetbrains/python/edu/PyExecuteFileLineMarkerProvider.java
index 19acded8f238..0c0208b1f144 100644
--- a/python/edu/src/com/jetbrains/python/edu/PyExecuteFileLineMarkerProvider.java
+++ b/python/edu/src/com/jetbrains/python/edu/PyExecuteFileLineMarkerProvider.java
@@ -54,23 +54,28 @@ public class PyExecuteFileLineMarkerProvider implements LineMarkerProvider {
             return new LineMarkerGutterIconRenderer<PsiElement>(this){
               @Override
               public AnAction getClickAction() {
-                final DefaultActionGroup group = new DefaultActionGroup();
-                group.add(new PyRunCurrentFileAction());
-                final PyExecuteFileExtensionPoint[] extensions =
-                  ApplicationManager.getApplication().getExtensions(PyExecuteFileExtensionPoint.EP_NAME);
-                for (PyExecuteFileExtensionPoint extension : extensions) {
-                  final AnAction action = extension.getRunAction();
-                  group.add(action);
-                }
-                if (group.getChildrenCount() == 1) {
-                  return new PyRunCurrentFileAction();
-                }
+
                 return new AnAction() {
                   @Override
                   public void actionPerformed(@NotNull AnActionEvent e) {
-                    final ListPopup popup =
-                      new PopupFactoryImpl().createActionGroupPopup(null, group, e.getDataContext(), false, false, false, null, 5);
-                    popup.showInBestPositionFor(e.getDataContext());
+                    final DefaultActionGroup group = new DefaultActionGroup();
+                    group.add(new PyRunCurrentFileAction());
+                    final PyExecuteFileExtensionPoint[] extensions =
+                      ApplicationManager.getApplication().getExtensions(PyExecuteFileExtensionPoint.EP_NAME);
+                    for (PyExecuteFileExtensionPoint extension : extensions) {
+                      final AnAction action = extension.getRunAction();
+                      action.update(e);
+                      if (e.getPresentation().isEnabled())
+                        group.add(action);
+                    }
+                    if (group.getChildrenCount() == 1) {
+                      new PyRunCurrentFileAction().actionPerformed(e);
+                    }
+                    else {
+                      final ListPopup popup =
+                        new PopupFactoryImpl().createActionGroupPopup(null, group, e.getDataContext(), false, false, false, null, 5);
+                      popup.showInBestPositionFor(e.getDataContext());
+                    }
                   }
                 };
               }

From f8c22ac4ee888f14f0c2869d85689d6bf669d39b Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 27 Oct 2014 20:30:44 +0300
Subject: [PATCH 112/132] IDEA-131923 Debugger: Referring Objects can't update
 on Set Value

---
 .../debugger/actions/JavaReferringObjectsValue.java         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java b/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java
index 96ba9e6eb54d..34959665d0cf 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java
@@ -168,4 +168,10 @@ public class JavaReferringObjectsValue extends JavaValue {
     }
     return null;
   }
+
+  @Nullable
+  @Override
+  public XValueModifier getModifier() {
+    return null;
+  }
 }

From 4715175804e2b9f67dd2560cd6c772928431a720 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Mon, 27 Oct 2014 18:51:33 +0100
Subject: [PATCH 113/132] java duplicates uses light tree processing

---
 .../dupLocator/index/DuplicatesIndex.java     |   2 +-
 .../index/DuplicatesInspectionBase.java       | 243 +++++++++++++-----
 2 files changed, 177 insertions(+), 68 deletions(-)

diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
index b3e94c465e70..cf4249cecd65 100644
--- a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
+++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
@@ -55,7 +55,7 @@ import java.util.Map;
 public class DuplicatesIndex extends FileBasedIndexExtension<Integer, TIntArrayList> implements PsiDependentIndex {
   static boolean ourEnabled = SystemProperties.getBooleanProperty("idea.enable.duplicates.online.calculation",
                                                                   isEnabledByDefault());
-  static boolean ourEnabledLightProfiles = false;
+  static boolean ourEnabledLightProfiles = true;
 
   private static boolean isEnabledByDefault() {
     Application application = ApplicationManager.getApplication();
diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesInspectionBase.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesInspectionBase.java
index f015fe21213b..f44a3e2953c7 100644
--- a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesInspectionBase.java
+++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesInspectionBase.java
@@ -3,10 +3,16 @@ package com.intellij.dupLocator.index;
 import com.intellij.codeInspection.*;
 import com.intellij.dupLocator.DuplicatesProfile;
 import com.intellij.dupLocator.DuplocatorState;
+import com.intellij.dupLocator.LightDuplicateProfile;
 import com.intellij.dupLocator.treeHash.FragmentsCollector;
 import com.intellij.dupLocator.util.PsiFragment;
+import com.intellij.lang.LighterAST;
+import com.intellij.lang.LighterASTNode;
+import com.intellij.lang.TreeBackedLighterAST;
 import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectFileIndex;
+import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileWithId;
@@ -35,94 +41,126 @@ public class DuplicatesInspectionBase extends LocalInspectionTool {
     final DuplicatesProfile profile = DuplicatesIndex.findDuplicatesProfile(psiFile.getFileType());
     if (profile == null) return ProblemDescriptor.EMPTY_ARRAY;
 
-    final DuplocatorState state = profile.getDuplocatorState(psiFile.getLanguage());
-    final SmartList<ProblemDescriptor> descriptors = new SmartList<ProblemDescriptor>();
+    final Ref<DuplicatedCodeProcessor> myProcessorRef = new Ref<DuplicatedCodeProcessor>();
 
-    final TreeMap<Integer, TextRange> reportedRanges = new TreeMap<Integer, TextRange>();
-    final TIntObjectHashMap<VirtualFile> reportedFiles = new TIntObjectHashMap<VirtualFile>();
-    final TIntObjectHashMap<PsiElement> reportedPsi = new TIntObjectHashMap<PsiElement>();
-    final TIntIntHashMap reportedOffsetInOtherFiles = new TIntIntHashMap();
-    final TIntIntHashMap fragmentSize = new TIntIntHashMap();
+    if (profile instanceof LightDuplicateProfile && DuplicatesIndex.ourEnabledLightProfiles) {
 
-    profile.createVisitor(new FragmentsCollector() {
-      @Override
-      public void add(int hash, final int cost, @Nullable final PsiFragment frag) {
-        if (!DuplicatesIndex.isIndexedFragment(frag, cost, profile, state)) {
-          return;
+      ((LightDuplicateProfile)profile).process(psiFile, new LightDuplicateProfile.Callback() {
+        DuplicatedCodeProcessor<LighterASTNode> myProcessor;
+        @Override
+        public void process(final LighterAST ast, final LighterASTNode node, int hash) {
+          class LightDuplicatedCodeProcessor extends DuplicatedCodeProcessor<LighterASTNode> {
+
+            LightDuplicatedCodeProcessor(VirtualFile file, Project project) {
+              super(file, project);
+            }
+
+            @Override
+            protected TextRange getRangeInElement(LighterASTNode node) {
+              return null;
+            }
+
+            @Override
+            protected PsiElement getPsi(LighterASTNode node) {
+              return ((TreeBackedLighterAST)ast).unwrap(node).getPsi();
+            }
+
+            @Override
+            protected int getStartOffset(LighterASTNode node) {
+              return node.getStartOffset();
+            }
+
+            @Override
+            protected int getEndOffset(LighterASTNode node) {
+              return node.getEndOffset();
+            }
+          }
+          if (myProcessor == null) {
+            myProcessor = new LightDuplicatedCodeProcessor(virtualFile, psiFile.getProject());
+            myProcessorRef.set(myProcessor);
+          }
+          myProcessor.process(hash, node);
         }
+      });
+    } else {
+      final DuplocatorState state = profile.getDuplocatorState(psiFile.getLanguage());
+      profile.createVisitor(new FragmentsCollector() {
+        DuplicatedCodeProcessor<PsiFragment> myProcessor;
+        @Override
+        public void add(int hash, final int cost, @Nullable final PsiFragment frag) {
+          if (!DuplicatesIndex.isIndexedFragment(frag, cost, profile, state)) {
+            return;
+          }
 
-        ProgressManager.checkCanceled();
-        FileBasedIndex.getInstance().processValues(DuplicatesIndex.NAME, hash, null, new FileBasedIndex.ValueProcessor<TIntArrayList>() {
-          final ProjectFileIndex myProjectFileIndex = ProjectFileIndex.SERVICE.getInstance(psiFile.getProject());
-          @Override
-          public boolean process(final VirtualFile file, final TIntArrayList list) {
-            for(int i = 0, len = list.size(); i < len; ++i) {
-              ProgressManager.checkCanceled();
+          class OldDuplicatedCodeProcessor extends DuplicatedCodeProcessor<PsiFragment> {
 
-              int value = list.getQuick(i);
+            OldDuplicatedCodeProcessor(VirtualFile file, Project project) {
+              super(file, project);
+            }
 
-              if (myProjectFileIndex.isInSource(virtualFile) && !myProjectFileIndex.isInSource(file)) return true;
-              if (!myProjectFileIndex.isInSource(virtualFile) && myProjectFileIndex.isInSource(file)) return true;
-              final int startOffset = frag.getStartOffset();
-              final int endOffset = frag.getEndOffset();
-              if (file.equals(virtualFile) && value >= startOffset && value < endOffset) continue;
-
-              PsiElement[] elements = frag.getElements();
-              PsiElement target = elements[0];
+            @Override
+            protected TextRange getRangeInElement(PsiFragment node) {
+              PsiElement[] elements = node.getElements();
               TextRange rangeInElement = null;
               if (elements.length > 1) {
-                PsiElement firstElement = elements[0];
-                target = firstElement.getParent();
+
                 PsiElement lastElement = elements[elements.length - 1];
                 rangeInElement = new TextRange(
                   elements[0].getStartOffsetInParent(),
                   lastElement.getStartOffsetInParent() + lastElement.getTextLength()
                 );
               }
+              return rangeInElement;
+            }
 
-              Integer fragmentStartOffsetInteger = startOffset;
-              SortedMap<Integer,TextRange> map = reportedRanges.subMap(fragmentStartOffsetInteger, endOffset);
-              int newFragmentSize = !map.isEmpty() ? 0:1;
+            @Override
+            protected PsiElement getPsi(PsiFragment node) {
+              PsiElement[] elements = node.getElements();
 
-              Iterator<Integer> iterator = map.keySet().iterator();
-              while(iterator.hasNext()) {
-                Integer next = iterator.next();
-                iterator.remove();
-                reportedFiles.remove(next);
-                reportedOffsetInOtherFiles.remove(next);
-                reportedPsi.remove(next);
-                newFragmentSize += fragmentSize.remove(next);
-              }
+              return elements.length > 1 ? elements[0].getParent() : elements[0];
+            }
 
-              reportedRanges.put(fragmentStartOffsetInteger, rangeInElement);
-              reportedFiles.put(fragmentStartOffsetInteger, file);
-              reportedOffsetInOtherFiles.put(fragmentStartOffsetInteger, value);
-              reportedPsi.put(fragmentStartOffsetInteger, target);
-              fragmentSize.put(fragmentStartOffsetInteger, newFragmentSize);
+            @Override
+            protected int getStartOffset(PsiFragment node) {
+              return node.getStartOffset();
+            }
 
-              return false;
+            @Override
+            protected int getEndOffset(PsiFragment node) {
+              return node.getEndOffset();
             }
-            return true;
           }
-        }, GlobalSearchScope.projectScope(psiFile.getProject()));
+          if (myProcessor == null) {
+            myProcessor = new OldDuplicatedCodeProcessor(virtualFile, psiFile.getProject());
+            myProcessorRef.set(myProcessor);
+          }
+          myProcessor.process(hash, frag);
+        }
+      }, true).visitNode(psiFile);
+    }
+
+    DuplicatedCodeProcessor<?> processor = myProcessorRef.get();
+
+    final SmartList<ProblemDescriptor> descriptors = new SmartList<ProblemDescriptor>();
+
+    if (processor != null) {
+
+      for(Map.Entry<Integer, TextRange> entry:processor.reportedRanges.entrySet()) {
+        final Integer offset = entry.getKey();
+        // todo 3 statements constant
+        if (processor.fragmentSize.get(offset) < 3) continue;
+        final VirtualFile file = processor.reportedFiles.get(offset);
+        String message = "Found duplicated code in " + file.getPath();
+
+        PsiElement targetElement = processor.reportedPsi.get(offset);
+        TextRange rangeInElement = entry.getValue();
+        final int offsetInOtherFile = processor.reportedOffsetInOtherFiles.get(offset);
+
+        LocalQuickFix fix = createNavigateToDupeFix(file, offsetInOtherFile);
+        ProblemDescriptor descriptor = manager
+          .createProblemDescriptor(targetElement, rangeInElement, message, ProblemHighlightType.WEAK_WARNING, isOnTheFly, fix);
+        descriptors.add(descriptor);
       }
-    }, true).visitNode(psiFile);
-
-    for(Map.Entry<Integer, TextRange> entry:reportedRanges.entrySet()) {
-      final Integer offset = entry.getKey();
-      // todo 3 statements constant
-      if (fragmentSize.get(offset) < 3) continue;
-      final VirtualFile file = reportedFiles.get(offset);
-      String message = "Found duplicated code in " + file.getPath();
-
-      PsiElement targetElement = reportedPsi.get(offset);
-      TextRange rangeInElement = entry.getValue();
-      final int offsetInOtherFile = reportedOffsetInOtherFiles.get(offset);
-
-      LocalQuickFix fix = createNavigateToDupeFix(file, offsetInOtherFile);
-      ProblemDescriptor descriptor = manager
-        .createProblemDescriptor(targetElement, rangeInElement, message, ProblemHighlightType.WEAK_WARNING, isOnTheFly, fix);
-      descriptors.add(descriptor);
     }
 
     return descriptors.isEmpty() ? null : descriptors.toArray(new ProblemDescriptor[descriptors.size()]);
@@ -131,4 +169,75 @@ public class DuplicatesInspectionBase extends LocalInspectionTool {
   protected LocalQuickFix createNavigateToDupeFix(@NotNull VirtualFile file, int offsetInOtherFile) {
     return null;
   }
+
+  static abstract class DuplicatedCodeProcessor<T> implements FileBasedIndex.ValueProcessor<TIntArrayList> {
+    final TreeMap<Integer, TextRange> reportedRanges = new TreeMap<Integer, TextRange>();
+    final TIntObjectHashMap<VirtualFile> reportedFiles = new TIntObjectHashMap<VirtualFile>();
+    final TIntObjectHashMap<PsiElement> reportedPsi = new TIntObjectHashMap<PsiElement>();
+    final TIntIntHashMap reportedOffsetInOtherFiles = new TIntIntHashMap();
+    final TIntIntHashMap fragmentSize = new TIntIntHashMap();
+    final VirtualFile virtualFile;
+    final Project project;
+    final ProjectFileIndex myProjectFileIndex;
+    T myNode;
+
+    DuplicatedCodeProcessor(VirtualFile file, Project project) {
+      virtualFile = file;
+      this.project = project;
+      myProjectFileIndex = ProjectFileIndex.SERVICE.getInstance(project);
+    }
+
+    void process(int hash, T node) {
+      ProgressManager.checkCanceled();
+      myNode = node;
+      FileBasedIndex.getInstance().processValues(DuplicatesIndex.NAME, hash, null, this, GlobalSearchScope.projectScope(project));
+    }
+
+    @Override
+    public boolean process(VirtualFile file, TIntArrayList list) {
+      for(int i = 0, len = list.size(); i < len; ++i) {
+        ProgressManager.checkCanceled();
+
+        int value = list.getQuick(i);
+
+        if (myProjectFileIndex.isInSource(virtualFile) && !myProjectFileIndex.isInSource(file)) return true;
+        if (!myProjectFileIndex.isInSource(virtualFile) && myProjectFileIndex.isInSource(file)) return true;
+        final int startOffset = getStartOffset(myNode);
+        final int endOffset = getEndOffset(myNode);
+        if (file.equals(virtualFile) && value >= startOffset && value < endOffset) continue;
+
+        PsiElement target = getPsi(myNode);
+        TextRange rangeInElement = getRangeInElement(myNode);
+
+        Integer fragmentStartOffsetInteger = startOffset;
+        SortedMap<Integer,TextRange> map = reportedRanges.subMap(fragmentStartOffsetInteger, endOffset);
+        int newFragmentSize = !map.isEmpty() ? 0:1;
+
+        Iterator<Integer> iterator = map.keySet().iterator();
+        while(iterator.hasNext()) {
+          Integer next = iterator.next();
+          iterator.remove();
+          reportedFiles.remove(next);
+          reportedOffsetInOtherFiles.remove(next);
+          reportedPsi.remove(next);
+          newFragmentSize += fragmentSize.remove(next);
+        }
+
+        reportedRanges.put(fragmentStartOffsetInteger, rangeInElement);
+        reportedFiles.put(fragmentStartOffsetInteger, file);
+        reportedOffsetInOtherFiles.put(fragmentStartOffsetInteger, value);
+        reportedPsi.put(fragmentStartOffsetInteger, target);
+        fragmentSize.put(fragmentStartOffsetInteger, newFragmentSize);
+
+        return false;
+      }
+      return true;
+    }
+
+    protected abstract TextRange getRangeInElement(T node);
+    protected abstract PsiElement getPsi(T node);
+
+    protected abstract int getStartOffset(T node);
+    protected abstract int getEndOffset(T node);
+  }
 }

From d63bcb17924d116455c17cd8a0b176142f534901 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Mon, 27 Oct 2014 19:05:24 +0100
Subject: [PATCH 114/132] handle wrapped CompilationCanceledExceptions

---
 .../src/org/jetbrains/jps/javac/JavacMain.java    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java
index ac4f4a0b78fc..751b74b459e2 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java
@@ -168,7 +168,16 @@ public class JavacMain {
       diagnosticConsumer.report(new PlainMessageDiagnostic(Diagnostic.Kind.ERROR, e.getMessage()));
     }
     catch (CompilationCanceledException ignored) {
-      diagnosticConsumer.report(new PlainMessageDiagnostic(Diagnostic.Kind.OTHER, "Compilation was canceled"));
+      handleCancelException(diagnosticConsumer);
+    }
+    catch (RuntimeException e) {
+      final Throwable cause = e.getCause();
+      if (cause instanceof CompilationCanceledException) {
+        handleCancelException(diagnosticConsumer);
+      }
+      else {
+        throw e;
+      }
     }
     finally {
       fileManager.close();
@@ -179,6 +188,10 @@ public class JavacMain {
     return false;
   }
 
+  private static void handleCancelException(DiagnosticOutputConsumer diagnosticConsumer) {
+    diagnosticConsumer.report(new PlainMessageDiagnostic(Diagnostic.Kind.OTHER, "Compilation was canceled"));
+  }
+
   private static List<JavaSourceTransformer> getSourceTransformers() {
     final Class<JavaSourceTransformer> transformerClass = JavaSourceTransformer.class;
     final ServiceLoader<JavaSourceTransformer> loader = ServiceLoader.load(transformerClass, transformerClass.getClassLoader());

From fac1f6a90694c4d1937c8d0f675779105ea5bf35 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Mon, 27 Oct 2014 19:08:00 +0100
Subject: [PATCH 115/132] logging pre-load process timings

---
 .../src/org/jetbrains/jps/cmdline/BuildMain.java           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
index e42d009d7122..7837b954da81 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
@@ -16,6 +16,7 @@
 package org.jetbrains.jps.cmdline;
 
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.io.FileSystemUtil;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import io.netty.bootstrap.Bootstrap;
@@ -124,9 +125,12 @@ public class BuildMain {
       final String projectPathToPreload = System.getProperty(PRELOAD_PROJECT_PATH, null);
       final String globalsPathToPreload = System.getProperty(PRELOAD_CONFIG_PATH, null); 
       if (projectPathToPreload != null && globalsPathToPreload != null) {
+        final long preloadStart = System.currentTimeMillis();
         final PreloadedData data = new PreloadedData();
         ourPreloadedData = data;
         try {
+          FileSystemUtil.getAttributes(projectPathToPreload); // this will pre-load all FS optimizations
+
           final BuildRunner runner = new BuildRunner(new JpsModelLoaderImpl(projectPathToPreload, globalsPathToPreload, null));
           data.setRunner(runner);
 
@@ -162,10 +166,11 @@ public class BuildMain {
             LOG.info("Error pre-loading FS state", e);
             fsState.clearAll();
           }
+          LOG.info("Pre-loaded project model in " + (System.currentTimeMillis() - preloadStart) + " ms");
         }
         catch (Throwable e) {
           LOG.info("Failed to pre-load project " + projectPathToPreload, e);
-          // just failed to preload the project, the situation will be handled later, when real build starts  
+          // just failed to preload the project, the situation will be handled later, when real build starts
         }
       }
       else if (projectPathToPreload != null || globalsPathToPreload != null){

From 3743bafca43b05790b73f13730f5d22065031699 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 27 Oct 2014 19:24:53 +0100
Subject: [PATCH 116/132] Cleanup (constants)

---
 .../com/intellij/util/text/DateFormatUtilTest.java        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java b/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
index 4268ce9fc1bb..5a0da0e80f8b 100644
--- a/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
@@ -38,7 +38,7 @@ public class DateFormatUtilTest {
 
   @Test
   public void testBasics() throws ParseException {
-    Clock.setTime(2004, 11, 10, 17, 10);
+    Clock.setTime(2004, Calendar.DECEMBER, 10, 17, 10);
 
     doTestPrettyDate("Today", "10.12.2004 17.00.00");
     doTestPrettyDate("Today", "10.12.2004 00.00.00");
@@ -49,7 +49,7 @@ public class DateFormatUtilTest {
 
   @Test
   public void testTime() throws Exception {
-    Clock.setTime(2004, 11, 10, 17, 10, 15);
+    Clock.setTime(2004, Calendar.DECEMBER, 10, 17, 10, 15);
 
     if (SystemInfo.isMac) {
       assertEquals("17:10", DateFormatUtil.formatTime(Clock.getTime()));
@@ -73,7 +73,7 @@ public class DateFormatUtilTest {
 
   @Test
   public void testPrettyDateTime() throws ParseException {
-    Clock.setTime(2004, 11, 10, 17, 0);
+    Clock.setTime(2004, Calendar.DECEMBER, 10, 17, 0);
     doTestDateTime("Moments ago", "10.12.2004 16.59.31");
     doTestDateTime("A minute ago", "10.12.2004 16.59.29");
     doTestDateTime("5 minutes ago", "10.12.2004 16.55.00");
@@ -82,7 +82,7 @@ public class DateFormatUtilTest {
     doTestDateTime("Yesterday " + DateFormatUtil.formatTime(DATE_FORMAT.parse("09.12.2004 15.00.00")), "09.12.2004 15.00.00");
     doTestDateTime("Today " + DateFormatUtil.formatTime(DATE_FORMAT.parse("10.12.2004 19.00.00")), "10.12.2004 19.00.00");
 
-    Clock.setTime(2004, 0, 1, 15, 53);
+    Clock.setTime(2004, Calendar.JANUARY, 1, 15, 53);
     doTestDateTime(DateFormatUtil.formatDateTime(DATE_FORMAT.parse("01.01.2003 15.53.00")), "01.01.2003 15.53.00");
     doTestDateTime("Yesterday " + DateFormatUtil.formatTime(DATE_FORMAT.parse("31.12.2003 15.00.00")), "31.12.2003 15.00.00");
   }

From aca2e0c94d60413c95ad5271fdb001cee88aa258 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 27 Oct 2014 19:30:23 +0100
Subject: [PATCH 117/132] Test fix

---
 .../testSrc/com/intellij/util/text/DateFormatUtilTest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java b/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
index 5a0da0e80f8b..01046586dc5d 100644
--- a/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
@@ -49,7 +49,7 @@ public class DateFormatUtilTest {
 
   @Test
   public void testTime() throws Exception {
-    Clock.setTime(2004, Calendar.DECEMBER, 10, 17, 10, 15);
+    Clock.setTime(1980, Calendar.DECEMBER, 10, 17, 10, 15);
 
     if (SystemInfo.isMac) {
       assertEquals("17:10", DateFormatUtil.formatTime(Clock.getTime()));
@@ -60,7 +60,7 @@ public class DateFormatUtilTest {
       assertEquals("17:10:15", printTimeForLocale("de_DE.UTF-8", Clock.getTime()));
     }
     else if (SystemInfo.isWinVistaOrNewer) {
-      long time = new Date().getTime();
+      long time = Clock.getTime();
       assertEquals(printWindowsTime(time), DateFormatUtil.formatTimeWithSeconds(time));
     }
     else {

From 33620affc7b8fcd4257ddeaeae7e6bfb599e8db8 Mon Sep 17 00:00:00 2001
From: "Vladimir.Orlov" <Vladimir.Orlov@jetbrains.com>
Date: Mon, 27 Oct 2014 22:02:36 +0300
Subject: [PATCH 118/132] idea.java.redist not null.

---
 .../com/intellij/openapi/updateSettings/impl/UpdateChecker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
index 14366fc46aa7..a846fd4fe87d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
@@ -760,7 +760,7 @@ public final class UpdateChecker {
     String toBuildNumber = newVersion.getNumber().asStringWithoutProductCode();
     String jdkMacRedist = System.getProperty("idea.java.redist");
     String bundledJdk = "";
-    if (jdkMacRedist.lastIndexOf("jdk-bundled") >= 0 ){
+    if (jdkMacRedist != null && jdkMacRedist.lastIndexOf("jdk-bundled") >= 0 ){
       bundledJdk = "jdk-bundled".equals(jdkMacRedist) ? "-jdk-bundled" : "-custom-jdk-bundled";
     }
 

From 31c80338561db70b480b62365ed28bb7045ac7d4 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 27 Oct 2014 20:14:52 +0100
Subject: [PATCH 119/132] IDEA-131989 (lib upgraded)

---
 .idea/libraries/proxy_vole.xml                |   2 +-
 build/scripts/libLicenses.gant                |   2 +-
 ...e_20120920.jar => proxy-vole_20131209.jar} | Bin 179039 -> 195181 bytes
 lib/required_for_dist.txt                     |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/{proxy-vole_20120920.jar => proxy-vole_20131209.jar} (59%)

diff --git a/.idea/libraries/proxy_vole.xml b/.idea/libraries/proxy_vole.xml
index 74a709c8cf82..6cb9a2e19b64 100644
--- a/.idea/libraries/proxy_vole.xml
+++ b/.idea/libraries/proxy_vole.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="proxy-vole">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/proxy-vole_20120920.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/proxy-vole_20131209.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 17f419dece1d..ebfcc890988a 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -262,7 +262,7 @@ libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "0.3",
 libraryLicense(name: "Cucumber-Java", libraryName: "cucumber-java", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
 libraryLicense(name: "Cucumber-JVM", libraryName: "cucumber-jvm", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
 libraryLicense(name: "Cucumber-Groovy", libraryName: "cucumber-groovy", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
-libraryLicense(name: "proxy-vole", libraryName: "proxy-vole", version: "20120920", license: "New BSD License", url: "http://code.google.com/p/proxy-vole/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
+libraryLicense(name: "proxy-vole", libraryName: "proxy-vole", version: "20131209", license: "New BSD License", url: "http://code.google.com/p/proxy-vole/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
 libraryLicense(name: "Rhino JavaScript Engine", libraryName: "rhino-js-1_7R4", version: "1.7R4", license: "MPL 1.1", url: "http://www.mozilla.org/rhino/", licenseUrl: "http://www.mozilla.org/MPL/MPL-1.1.html")
 libraryLicense(name: "asm-4.0-all", libraryName: "asm-4.0-all", version: "4.0", attachedTo: "ByteCodeViewer", license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html")
 libraryLicense(name: "jsr305", libraryName: "jsr305", version: "snapshot", license: "BSD", url: "http://code.google.com/p/jsr-305/", licenseUrl: "http://code.google.com/p/jsr-305/source/browse/trunk/ri/LICENSE")
diff --git a/lib/proxy-vole_20120920.jar b/lib/proxy-vole_20131209.jar
similarity index 59%
rename from lib/proxy-vole_20120920.jar
rename to lib/proxy-vole_20131209.jar
index 29db3d34eec3a369521863f0ec90f979d521e801..70927e4f6c965f6809c31b2a0bb935d76094bc94 100644
GIT binary patch
delta 72551
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
WY+8=^a;rG2IH7tR&dquVC+C0eLii#8

delta 56834
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%0AY2o$0rap
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

diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 997eb52a6fc6..a989728f72e1 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -52,7 +52,7 @@ netty-all-4.1.0.Beta3.jar
 oromatcher.jar
 picocontainer.jar
 protobuf-2.5.0.jar
-proxy-vole_20120920.jar
+proxy-vole_20131209.jar
 pty4j-0.3.jar
 purejavacomm.jar
 resolver.jar

From 98b4ec43a696f8d90c4e9d7689d4fa377e5d2056 Mon Sep 17 00:00:00 2001
From: Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Date: Mon, 27 Oct 2014 21:56:12 +0400
Subject: [PATCH 120/132] Supported "initializer block" arrangement entry
 (IDEA-95115)

Previous behaviour was to treat initializer block as field and stick it with previous field, now it's eliminated with matching and rearranging according to matching rules. See comments also in [CR-IC-6618]
---
 .../psi/codeStyle/JavaCodeStyleSettings.java  |  2 +
 .../arrangement/JavaArrangementVisitor.java   | 24 +-----
 .../codeStyle/arrangement/JavaRearranger.java | 34 +++++++-
 .../java/JavaSpacePropertyProcessor.java      | 11 +--
 ...JavaRearrangerByTypeAndModifierTest.groovy |  6 +-
 .../JavaRearrangerByTypeTest.groovy           | 81 +++++++++++++++++++
 .../java/JavaFormatterBlankLinesTest.java     |  1 +
 .../arrangement/std/StdArrangementTokens.java |  1 +
 8 files changed, 126 insertions(+), 34 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java b/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
index 8024f7bcd335..7ea13ffd9646 100644
--- a/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
+++ b/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
@@ -35,4 +35,6 @@ public class JavaCodeStyleSettings extends CustomCodeStyleSettings {
   public int ANNOTATION_PARAMETER_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP;
   public boolean ALIGN_MULTILINE_ANNOTATION_PARAMETERS = false;
 
+  public int BLANK_LINES_AROUND_INITIALIZER = 1;
+
 }
diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java
index 21d2e1881d05..f4e54f9b7724 100644
--- a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java
+++ b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java
@@ -341,31 +341,11 @@ public class JavaArrangementVisitor extends JavaRecursiveElementVisitor {
 
   @Override
   public void visitClassInitializer(PsiClassInitializer initializer) {
-    JavaElementArrangementEntry entry = createNewEntry(initializer, initializer.getTextRange(), FIELD, null, true);
+    JavaElementArrangementEntry entry = createNewEntry(initializer, initializer.getTextRange(), INIT_BLOCK, null, true);
     if (entry == null) {
       return;
     }
-
-    PsiElement classLBrace = null;
-    PsiClass clazz = initializer.getContainingClass();
-    if (clazz != null) {
-      classLBrace = clazz.getLBrace();
-    }
-    for (PsiElement e = initializer.getPrevSibling(); e != null; e = e.getPrevSibling()) {
-      JavaElementArrangementEntry prevEntry;
-      if (e == classLBrace) {
-        prevEntry = myEntries.get(clazz);
-      }
-      else {
-        prevEntry = myEntries.get(e);
-      }
-      if (prevEntry != null) {
-        entry.addDependency(prevEntry);
-      }
-      if (!(e instanceof PsiWhiteSpace)) {
-        break;
-      }
-    }
+    parseModifiers(initializer.getModifierList(), entry);
   }
 
   @NotNull
diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java
index 0baf085c6f64..8e79d7e67eff 100644
--- a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java
+++ b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java
@@ -27,6 +27,7 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
+import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
 import com.intellij.psi.codeStyle.arrangement.engine.ArrangementEngine;
 import com.intellij.psi.codeStyle.arrangement.group.ArrangementGroupingRule;
 import com.intellij.psi.codeStyle.arrangement.match.ArrangementEntryMatcher;
@@ -36,6 +37,7 @@ import com.intellij.psi.codeStyle.arrangement.model.ArrangementAtomMatchConditio
 import com.intellij.psi.codeStyle.arrangement.model.ArrangementCompositeMatchCondition;
 import com.intellij.psi.codeStyle.arrangement.model.ArrangementMatchCondition;
 import com.intellij.psi.codeStyle.arrangement.std.*;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.ContainerUtilRt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -62,7 +64,7 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
   // Type
   @NotNull private static final Set<ArrangementSettingsToken>                                SUPPORTED_TYPES     =
     ContainerUtilRt.newLinkedHashSet(
-      FIELD, CONSTRUCTOR, METHOD, CLASS, INTERFACE, ENUM, GETTER, SETTER, OVERRIDDEN
+      FIELD, INIT_BLOCK, CONSTRUCTOR, METHOD, CLASS, INTERFACE, ENUM, GETTER, SETTER, OVERRIDDEN
     );
   // Modifier
   @NotNull private static final Set<ArrangementSettingsToken>                                SUPPORTED_MODIFIERS =
@@ -79,6 +81,9 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
   @NotNull private static final Collection<Set<ArrangementSettingsToken>>                    MUTEXES             =
     ContainerUtilRt.newArrayList();
 
+  private static final Set<ArrangementSettingsToken> TYPES_WITH_DISABLED_ORDER = ContainerUtil.newHashSet();
+  private static final Set<ArrangementSettingsToken> TYPES_WITH_DISABLED_NAME_MATCH = ContainerUtil.newHashSet();
+
   static {
     Set<ArrangementSettingsToken> visibilityModifiers = ContainerUtilRt.newHashSet(PUBLIC, PROTECTED, PACKAGE_PRIVATE, PRIVATE);
     MUTEXES.add(visibilityModifiers);
@@ -96,6 +101,11 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
     MODIFIERS_BY_TYPE.put(GETTER, ContainerUtilRt.<ArrangementSettingsToken>newHashSet());
     MODIFIERS_BY_TYPE.put(SETTER, ContainerUtilRt.<ArrangementSettingsToken>newHashSet());
     MODIFIERS_BY_TYPE.put(OVERRIDDEN, ContainerUtilRt.<ArrangementSettingsToken>newHashSet());
+    MODIFIERS_BY_TYPE.put(INIT_BLOCK, ContainerUtilRt.newHashSet(STATIC));
+
+    TYPES_WITH_DISABLED_ORDER.add(INIT_BLOCK);
+
+    TYPES_WITH_DISABLED_NAME_MATCH.add(INIT_BLOCK);
   }
 
   private static final Map<ArrangementSettingsToken, List<ArrangementSettingsToken>> GROUPING_RULES = ContainerUtilRt.newLinkedHashMap();
@@ -129,6 +139,8 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
     for (ArrangementSettingsToken modifier : visibility) {
       and(matchRules, FIELD, STATIC, modifier);
     }
+    and(matchRules, INIT_BLOCK, STATIC);
+
     for (ArrangementSettingsToken modifier : visibility) {
       and(matchRules, FIELD, FINAL, modifier);
     }
@@ -136,6 +148,7 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
       and(matchRules, FIELD, modifier);
     }
     and(matchRules, FIELD);
+    and(matchRules, INIT_BLOCK);
     and(matchRules, CONSTRUCTOR);
     and(matchRules, METHOD, STATIC);
     and(matchRules, METHOD);
@@ -304,10 +317,14 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
     }
 
     CommonCodeStyleSettings commonSettings = settings.getCommonSettings(JavaLanguage.INSTANCE);
+    JavaCodeStyleSettings javaSettings = settings.getCustomSettings(JavaCodeStyleSettings.class);
     if (FIELD.equals(target.getType())) {
       if (parent != null && parent.getType() == INTERFACE) {
         return commonSettings.BLANK_LINES_AROUND_FIELD_IN_INTERFACE;
       }
+      else if (INIT_BLOCK.equals(previous.getType())) {
+        return javaSettings.BLANK_LINES_AROUND_INITIALIZER;
+      }
       else {
         return commonSettings.BLANK_LINES_AROUND_FIELD;
       }
@@ -323,6 +340,9 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
     else if (CLASS.equals(target.getType())) {
       return commonSettings.BLANK_LINES_AROUND_CLASS;
     }
+    else if (INIT_BLOCK.equals(target.getType())) {
+      return javaSettings.BLANK_LINES_AROUND_INITIALIZER;
+    }
     else {
       return -1;
     }
@@ -363,9 +383,10 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
 
   @Override
   public boolean isEnabled(@NotNull ArrangementSettingsToken token, @Nullable ArrangementMatchCondition current) {
-    if (SUPPORTED_TYPES.contains(token) || SUPPORTED_ORDERS.contains(token) || StdArrangementTokens.Regexp.NAME.equals(token)) {
+    if (SUPPORTED_TYPES.contains(token)) {
       return true;
     }
+
     ArrangementSettingsToken type = null;
     if (current != null) {
       type = ArrangementUtil.parseType(current);
@@ -373,6 +394,15 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
     if (type == null) {
       type = NO_TYPE;
     }
+
+    if (SUPPORTED_ORDERS.contains(token)) {
+      return !TYPES_WITH_DISABLED_ORDER.contains(type);
+    }
+
+    if (StdArrangementTokens.Regexp.NAME.equals(token)) {
+      return !TYPES_WITH_DISABLED_NAME_MATCH.contains(type);
+    }
+
     Set<ArrangementSettingsToken> modifiers = MODIFIERS_BY_TYPE.get(type);
     return modifiers != null && modifiers.contains(token);
   }
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
index 84c15d5db1a9..8a89027e2d56 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
@@ -425,13 +425,8 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
         myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
       }
       else if (myRole1 == ChildRole.FIELD) {
-        int lines = Math.max(getLinesAroundField(), getLinesAroundMethod()) + 1;
-        // IJ has been keeping initialization block which starts at the same line as a field for a while.
-        // However, it's not convenient for a situation when particular code is created via PSI - it's easier to not bothering
-        // with whitespace elements when inserting, say, new initialization blocks. That's why we don't enforce new line
-        // only during explicit reformatting ('Reformat' action).
-        //int minLineFeeds = FormatterUtil.isFormatterCalledExplicitly() ? 0 : 1;
-        myResult = Spacing.createSpacing(0, mySettings.SPACE_BEFORE_CLASS_LBRACE ? 1 : 0, 1, true, mySettings.KEEP_BLANK_LINES_BEFORE_RBRACE, lines);
+        int blankLines = myJavaSettings.BLANK_LINES_AROUND_INITIALIZER + 1;
+        myResult = Spacing.createSpacing(0, mySettings.SPACE_BEFORE_CLASS_LBRACE ? 1 : 0, blankLines, true, mySettings.KEEP_BLANK_LINES_BEFORE_RBRACE);
       }
       else if (myRole1 == ChildRole.CLASS) {
         setAroundClassSpacing();
@@ -450,7 +445,7 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
         setAroundClassSpacing();
       }
       else {
-        final int blankLines = getLinesAroundMethod() + 1;
+        final int blankLines = myJavaSettings.BLANK_LINES_AROUND_INITIALIZER + 1;
         myResult = Spacing.createSpacing(0, Integer.MAX_VALUE, blankLines, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_DECLARATIONS);
       }
     }
diff --git a/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeAndModifierTest.groovy b/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeAndModifierTest.groovy
index 23f6d1b566c2..1cc9c93bc9c5 100644
--- a/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeAndModifierTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeAndModifierTest.groovy
@@ -83,9 +83,10 @@ class Test {
       expected: '''\
 class Test {
   public int j;
-  { j = 1; }
   protected int k;
   private int i;
+
+  { j = 1; }
 }''',
       rules: [rule(FIELD, PUBLIC), rule(FIELD, PROTECTED), rule(FIELD, PRIVATE)])
   }
@@ -101,10 +102,11 @@ class Test {
 }''',
       expected: '''\
 class Test {
-  { j = 1; }
   public int j;
   protected int k;
   private int i;
+
+  { j = 1; }
 }''',
       rules: [rule(FIELD, PUBLIC), rule(FIELD, PROTECTED), rule(FIELD, PRIVATE)])
   }
diff --git a/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeTest.groovy b/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeTest.groovy
index 7f15babc1e93..62fedc613f7f 100644
--- a/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeTest.groovy
@@ -569,4 +569,85 @@ class B extends A {
       rules: [rule(PUBLIC, METHOD), rule(PRIVATE, METHOD)]
     )
   }
+
+  void "test initializer block after fields"() {
+    doTest(
+      initial: '''\
+public class NewOneClass {
+
+    {
+        a = 1;
+    }
+
+    int a;
+
+    {
+        b = 5;
+    }
+
+    int b;
+
+}
+''',
+      expected: '''\
+public class NewOneClass {
+
+    int a;
+    int b;
+
+    {
+        a = 1;
+    }
+
+    {
+        b = 5;
+    }
+
+}
+''',
+      rules: [rule(FIELD), rule(INIT_BLOCK)]
+    )
+  }
+
+  void "test static initializer block"() {
+    doTest(
+      initial: '''\
+public class NewOneClass {
+
+    static {
+        a = 1;
+    }
+
+    static int a;
+
+    {
+        b = 5;
+    }
+
+    int b;
+
+}
+''',
+      expected: '''\
+public class NewOneClass {
+
+    static int a;
+
+    static {
+        a = 1;
+    }
+
+    int b;
+
+    {
+        b = 5;
+    }
+
+}
+''',
+      rules: [rule(STATIC, FIELD), rule(STATIC, INIT_BLOCK), rule(FIELD), rule(INIT_BLOCK)]
+    )
+  }
+
+
 }
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBlankLinesTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBlankLinesTest.java
index fe005a84db3f..e0c845d066c6 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBlankLinesTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBlankLinesTest.java
@@ -25,6 +25,7 @@ public class JavaFormatterBlankLinesTest extends AbstractJavaFormatterTest {
 
   public void testBlankLinesAroundClassInitializationBlock() throws Exception {
     getSettings().BLANK_LINES_AROUND_METHOD = 3;
+    getJavaSettings().BLANK_LINES_AROUND_INITIALIZER = 3;
     doTextTest(
       "class T {\n" +
       "    private final DecimalFormat fmt = new DecimalFormat();\n" +
diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokens.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokens.java
index 764f1bcea51f..a5753c8375bb 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokens.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokens.java
@@ -164,6 +164,7 @@ public class StdArrangementTokens {
     @NotNull public static final ArrangementSettingsToken PROPERTY        = invertible("PROPERTY", StdArrangementTokenType.ENTRY_TYPE);
     @NotNull public static final ArrangementSettingsToken EVENT_HANDLER   = invertible("EVENT_HANDLER", StdArrangementTokenType.ENTRY_TYPE);
     @NotNull public static final ArrangementSettingsToken STATIC_INIT     = invertible("STATIC_INIT", StdArrangementTokenType.ENTRY_TYPE);
+    @NotNull public static final ArrangementSettingsToken INIT_BLOCK      = invertible("INITIALIZER BLOCK", StdArrangementTokenType.ENTRY_TYPE);
     @NotNull public static final ArrangementSettingsToken NAMESPACE       = invertible("NAMESPACE", StdArrangementTokenType.ENTRY_TYPE);
     @NotNull public static final ArrangementSettingsToken TRAIT           = invertible("TRAIT", StdArrangementTokenType.ENTRY_TYPE);
 

From ccb3f71fce3445c31cb1307f267797036f06c6d7 Mon Sep 17 00:00:00 2001
From: Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Date: Mon, 27 Oct 2014 22:05:35 +0400
Subject: [PATCH 121/132] Added option "Blank lines | Around initializer" to
 "Code Style Settings | Java | Blank Lines" panel

---
 .../intellij/ide/JavaLanguageCodeStyleSettingsProvider.java   | 4 ++++
 .../src/messages/ApplicationBundle.properties                 | 1 +
 2 files changed, 5 insertions(+)

diff --git a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
index f4ad6bf6e954..37332ff434dc 100644
--- a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
+++ b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
@@ -168,6 +168,10 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett
       String groupName = ApplicationBundle.message("wrapping.fields.annotation");
       consumer.showCustomOption(JavaCodeStyleSettings.class, "DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION", "Do not wrap after single annotation", groupName);
     }
+    else if (settingsType == SettingsType.BLANK_LINES_SETTINGS) {
+      consumer.showAllStandardOptions();
+      consumer.showCustomOption(JavaCodeStyleSettings.class, "BLANK_LINES_AROUND_INITIALIZER", ApplicationBundle.message("editbox.blanklines.around.initializer"), CodeStyleSettingsCustomizable.BLANK_LINES);
+    }
     else {
       consumer.showAllStandardOptions();
     }
diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
index b02ba924695f..7d6fb1099492 100644
--- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties
+++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
@@ -45,6 +45,7 @@ editbox.blanklines.around.method=Around method:
 editbox.blanklines.before.method.body=Before method body:
 editbox.blanklines.after.class.header=After class header:
 editbox.blanklines.after.anonymous.class.header=After anonymous class header:
+editbox.blanklines.around.initializer=Around initializer:
 title.blank.lines=Blank Lines
 title.keep.blank.lines=Keep Maximum Blank Lines
 title.minimum.blank.lines=Minimum Blank Lines

From d253c4201db782f38db0fa18b3f38e42584f600e Mon Sep 17 00:00:00 2001
From: Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Date: Mon, 27 Oct 2014 22:14:53 +0400
Subject: [PATCH 122/132] fixed failing test
 "testWrapMethodAnnotationBeforeParams"

Added possibility to specify parent block for AbstractJavaBlock. When processing method, wrap after annotation (on keyword "public, private, protected") is set to be parent of method parameters wrap. So when wrap occurs parent wrap is used instead of method parameter wrap (which is now child)
---
 .../psi/formatter/java/AbstractJavaBlock.java | 47 +++++++++++++++----
 .../java/BlockContainingJavaBlock.java        |  7 ++-
 .../psi/formatter/java/SimpleJavaBlock.java   |  2 +-
 .../formatter/java/wrap/JavaWrapManager.java  |  4 +-
 .../java/wrap/impl/JavaChildWrapArranger.java | 15 ++++--
 .../formatter/java/JavaFormatterWrapTest.java |  1 -
 6 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
index a49cede74175..c092223ea47a 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
@@ -39,6 +39,7 @@ import com.intellij.psi.impl.source.tree.java.ClassElement;
 import com.intellij.psi.jsp.JspElementType;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.text.CharArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -90,6 +91,8 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
 
   private final JavaWrapManager myWrapManager;
   private final AlignmentInColumnsHelper myAlignmentInColumnsHelper;
+  private Map<IElementType, Wrap> myPreferredWraps;
+  private AbstractJavaBlock myParentBlock;
 
   protected AbstractJavaBlock(@NotNull final ASTNode node,
                               final Wrap wrap,
@@ -505,12 +508,9 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
                                   mySettings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS);
       }
       else if (childType == JavaTokenType.LPARENTH && nodeType == JavaElementType.PARAMETER_LIST) {
-        // There is a possible case that particular annotated method definition is too long. We may wrap either after annotation
-        // or after opening lbrace then. Our strategy is to wrap after annotation whenever possible.
-        Wrap wrap = Wrap.createWrap(getWrapType(mySettings.METHOD_PARAMETERS_WRAP), false);
-        child = processParenthesisBlock(result, child,
-                                  WrappingStrategy.createDoNotWrapCommaStrategy(wrap),
-                                  mySettings.ALIGN_MULTILINE_PARAMETERS);
+        Wrap wrapToUse = getMethodParametersWrap();
+        WrappingStrategy wrapStrategy = WrappingStrategy.createDoNotWrapCommaStrategy(wrapToUse);
+        child = processParenthesisBlock(result, child, wrapStrategy, mySettings.ALIGN_MULTILINE_PARAMETERS);
       }
       else if (childType == JavaTokenType.LPARENTH && nodeType == JavaElementType.RESOURCE_LIST) {
         Wrap wrap = Wrap.createWrap(getWrapType(mySettings.RESOURCE_LIST_WRAP), false);
@@ -572,6 +572,25 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
     return child;
   }
 
+  @NotNull
+  private Wrap getMethodParametersWrap() {
+    Wrap preferredWrap = getModifierListWrap();
+    if (preferredWrap == null) {
+      return Wrap.createWrap(getWrapType(mySettings.METHOD_PARAMETERS_WRAP), false);
+    } else {
+      return Wrap.createChildWrap(preferredWrap, getWrapType(mySettings.METHOD_PARAMETERS_WRAP), false);
+    }
+  }
+
+  @Nullable
+  private Wrap getModifierListWrap() {
+    AbstractJavaBlock parentBlock = getParentBlock();
+    if (parentBlock != null) {
+      return parentBlock.getReservedWrap(JavaElementType.MODIFIER_LIST);
+    }
+    return null;
+  }
+
   private ASTNode processField(@NotNull final List<Block> result,
                                ASTNode child,
                                @NotNull final AlignmentStrategy alignmentStrategy,
@@ -1135,7 +1154,7 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
   @Nullable
   @Override
   public Wrap getReservedWrap(IElementType elementType) {
-    return null;
+    return myPreferredWraps != null ? myPreferredWraps.get(elementType) : null;
   }
 
   /**
@@ -1150,7 +1169,11 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
    * @param reservedWrap    reserved wrap instance
    * @param operationType   target operation type to associate with the given wrap instance
    */
-  protected void setReservedWrap(final Wrap reservedWrap, final IElementType operationType) {
+  public void setReservedWrap(final Wrap reservedWrap, final IElementType operationType) {
+    if (myPreferredWraps == null) {
+      myPreferredWraps = ContainerUtil.newHashMap();
+    }
+    myPreferredWraps.put(operationType, reservedWrap);
   }
 
   @Nullable
@@ -1262,6 +1285,14 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
     return null;
   }
 
+  public AbstractJavaBlock getParentBlock() {
+    return myParentBlock;
+  }
+
+  public void setParentBlock(@NotNull AbstractJavaBlock parentBlock) {
+    myParentBlock = parentBlock;
+  }
+
   /**
    * Allows to answer if special 'variable declaration alignment' strategy should be used for the given node.
    * I.e. given node is supposed to be parent node of sub-nodes that should be aligned 'by-columns'.
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/BlockContainingJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/BlockContainingJavaBlock.java
index a97d6d12646f..098993124bdf 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/BlockContainingJavaBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/BlockContainingJavaBlock.java
@@ -61,8 +61,13 @@ public class BlockContainingJavaBlock extends AbstractJavaBlock{
 
     buildChildren(result, childAlignment, childWrap);
 
-    return result;
+    for (Block block : result) {
+      if (block instanceof AbstractJavaBlock) {
+        ((AbstractJavaBlock)block).setParentBlock(this);
+      }
+    }
 
+    return result;
   }
 
   private void buildChildren(final ArrayList<Block> result, final Alignment childAlignment, final Wrap childWrap) {
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java
index c74b9c05b19b..478f8ba8d065 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java
@@ -127,7 +127,7 @@ public class SimpleJavaBlock extends AbstractJavaBlock {
   }
 
   @Override
-  protected void setReservedWrap(final Wrap reservedWrap, final IElementType operationType) {
+  public void setReservedWrap(final Wrap reservedWrap, final IElementType operationType) {
     myReservedWrap.put(operationType, reservedWrap);
   }
 
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/wrap/JavaWrapManager.java b/java/java-impl/src/com/intellij/psi/formatter/java/wrap/JavaWrapManager.java
index 50bbcbc3b5d6..54965f9eca1e 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/wrap/JavaWrapManager.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/wrap/JavaWrapManager.java
@@ -19,8 +19,8 @@ import com.intellij.formatting.ASTBlock;
 import com.intellij.formatting.Block;
 import com.intellij.formatting.Wrap;
 import com.intellij.lang.ASTNode;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
+import com.intellij.psi.formatter.java.AbstractJavaBlock;
 import com.intellij.psi.formatter.java.wrap.impl.JavaChildBlockWrapFactory;
 import com.intellij.psi.formatter.java.wrap.impl.JavaChildWrapArranger;
 import org.jetbrains.annotations.Nullable;
@@ -79,7 +79,7 @@ public class JavaWrapManager {
    */
   @Nullable
   public Wrap arrangeChildWrap(ASTNode child, ASTNode parent, CommonCodeStyleSettings settings, Wrap suggestedWrap,
-                               ReservedWrapsProvider reservedWrapsProvider) 
+                               AbstractJavaBlock reservedWrapsProvider)
   {
     return myChildArranger.arrange(child, parent, settings, suggestedWrap, reservedWrapsProvider);
   }
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/wrap/impl/JavaChildWrapArranger.java b/java/java-impl/src/com/intellij/psi/formatter/java/wrap/impl/JavaChildWrapArranger.java
index 5b05ced2d5a1..579e9ae86180 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/wrap/impl/JavaChildWrapArranger.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/wrap/impl/JavaChildWrapArranger.java
@@ -22,6 +22,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
 import com.intellij.psi.formatter.FormatterUtil;
+import com.intellij.psi.formatter.java.AbstractJavaBlock;
 import com.intellij.psi.formatter.java.JavaFormatterUtil;
 import com.intellij.psi.formatter.java.wrap.JavaWrapManager;
 import com.intellij.psi.formatter.java.wrap.ReservedWrapsProvider;
@@ -70,7 +71,7 @@ public class JavaChildWrapArranger {
                       ASTNode parent,
                       CommonCodeStyleSettings settings,
                       Wrap suggestedWrap,
-                      ReservedWrapsProvider reservedWrapsProvider) {
+                      AbstractJavaBlock reservedWrapsProvider) {
     final JavaCodeStyleSettings javaSettings = settings.getRootSettings().getCustomSettings(JavaCodeStyleSettings.class);
     ASTNode directParent = child.getTreeParent();
     int role = ((CompositeElement)directParent).getChildRole(child);
@@ -188,8 +189,9 @@ public class JavaChildWrapArranger {
         if (javaSettings.DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION && isFieldModifierListWithSingleAnnotation(parent)) {
           return Wrap.createWrap(WrapType.NONE, false);
         }
-
-        return Wrap.createWrap(getWrapType(getAnnotationWrapType(parent.getTreeParent(), child, settings)), true);
+        Wrap wrap = Wrap.createWrap(getWrapType(getAnnotationWrapType(parent.getTreeParent(), child, settings)), true);
+        putPreferredWrapInParentBlock(reservedWrapsProvider, wrap);
+        return wrap;
       }
 
       return null;
@@ -263,6 +265,13 @@ public class JavaChildWrapArranger {
     return suggestedWrap;
   }
 
+  private static void putPreferredWrapInParentBlock(@NotNull AbstractJavaBlock block, @NotNull Wrap preferredWrap) {
+    AbstractJavaBlock parentBlock = block.getParentBlock();
+    if (parentBlock != null) {
+      parentBlock.setReservedWrap(preferredWrap, JavaElementType.MODIFIER_LIST);
+    }
+  }
+
   private static boolean isFieldModifierListWithSingleAnnotation(@NotNull ASTNode elem) {
     ASTNode parent = elem.getTreeParent();
     if (parent != null && parent.getElementType() == JavaElementType.FIELD) {
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java
index b16e23e83e37..fa960980d297 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java
@@ -260,7 +260,6 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest {
     );
   }
 
-  @Bombed(user = "Roman Shevchenko", year = 2014, month = Calendar.MARCH, day = 14)
   public void testWrapMethodAnnotationBeforeParams() {
     // Inspired by IDEA-59536
     getSettings().RIGHT_MARGIN = 90;

From 22d8d2996c7d9fe780e8de5350b99b2c579eee0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20C=C3=A9bron?= <yann.cebron@jetbrains.com>
Date: Mon, 27 Oct 2014 20:44:16 +0100
Subject: [PATCH 123/132] IDEA-131863 Plugin.xml extension documentation: show
 EP definition in addition to javadoc

---
 .../ExtensionPointDocumentationProvider.java  | 38 ++++++++++----
 ...nsionPointDocumentationProviderTest.groovy | 51 -------------------
 ...tensionPointDocumentationProviderTest.java | 44 ++++++++++++++++
 3 files changed, 73 insertions(+), 60 deletions(-)
 delete mode 100644 plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.groovy
 create mode 100644 plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.java

diff --git a/plugins/devkit/src/references/extensions/ExtensionPointDocumentationProvider.java b/plugins/devkit/src/references/extensions/ExtensionPointDocumentationProvider.java
index e191bd8aeee3..cc9f3ed3ab26 100644
--- a/plugins/devkit/src/references/extensions/ExtensionPointDocumentationProvider.java
+++ b/plugins/devkit/src/references/extensions/ExtensionPointDocumentationProvider.java
@@ -15,13 +15,16 @@
  */
 package org.jetbrains.idea.devkit.references.extensions;
 
+import com.intellij.codeInsight.javadoc.JavaDocInfoGenerator;
 import com.intellij.lang.documentation.DocumentationProviderEx;
 import com.intellij.lang.java.JavaDocumentationProvider;
 import com.intellij.lang.xml.XMLLanguage;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTypesUtil;
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlToken;
@@ -45,15 +48,23 @@ public class ExtensionPointDocumentationProvider extends DocumentationProviderEx
 
     final XmlFile epDeclarationFile = (XmlFile)extensionPoint.getXmlTag().getContainingFile();
     final Module epModule = ModuleUtilCore.findModuleForFile(epDeclarationFile.getVirtualFile(), element.getProject());
-    final PsiClass epClass = getExtensionPointClass(extensionPoint);
     final String epPrefix = extensionPoint.getNamePrefix();
-    return
-      (epModule == null ? "" : "[" + epModule.getName() + "]") +
-      (epPrefix == null ? "" : " " + epPrefix) +
-      "\n" +
-      "<b>" + extensionPoint.getEffectiveName() + "</b>" +
-      " [" + epDeclarationFile.getName() + "]\n" +
-      (epClass == null ? "<unknown>" : epClass.getQualifiedName());
+
+    final PsiClass epClass = getExtensionPointClass(extensionPoint);
+    StringBuilder epClassText = new StringBuilder();
+    if (epClass != null) {
+      JavaDocInfoGenerator.generateType(epClassText, PsiTypesUtil.getClassType(epClass), epClass, true);
+    }
+    else {
+      epClassText.append("<unknown>");
+    }
+
+    return (epModule == null ? "" : "[" + epModule.getName() + "]") +
+           (epPrefix == null ? "" : " " + epPrefix) +
+           "<br/>" +
+           "<b>" + extensionPoint.getEffectiveName() + "</b>" +
+           " [" + epDeclarationFile.getName() + "]<br/>" +
+           epClassText.toString();
   }
 
   @Override
@@ -63,7 +74,16 @@ public class ExtensionPointDocumentationProvider extends DocumentationProviderEx
 
     final PsiClass epClass = getExtensionPointClass(extensionPoint);
     if (epClass != null) {
-      return JavaDocumentationProvider.generateExternalJavadoc(epClass);
+      StringBuilder sb = new StringBuilder();
+      sb.append("<em>EP Definition</em><br/>");
+      final String quickInfo = StringUtil.notNullize(getQuickNavigateInfo(element, originalElement));
+      sb.append(quickInfo);
+      sb.append("<br/>");
+      sb.append("<br/>");
+      sb.append("<em>EP Implementation</em>");
+      sb.append(JavaDocumentationProvider.generateExternalJavadoc(epClass));
+
+      return sb.toString();
     }
     return null;
   }
diff --git a/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.groovy b/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.groovy
deleted file mode 100644
index 6a3a89997b8d..000000000000
--- a/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.groovy
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * 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 org.jetbrains.idea.devkit.references.extensions
-import com.intellij.codeInsight.documentation.DocumentationManager
-import com.intellij.lang.documentation.DocumentationProvider
-import com.intellij.openapi.application.PluginPathManager
-import com.intellij.pom.PomTargetPsiElement
-import com.intellij.psi.PsiElement
-import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
-import com.intellij.util.ui.UIUtil
-import com.intellij.util.xml.DomTarget
-
-class ExtensionPointDocumentationProviderTest extends LightCodeInsightFixtureTestCase {
-
-  @Override
-  String getBasePath() {
-    return PluginPathManager.getPluginHomePathRelative("devkit") + "/testData/references/extensions"
-  }
-
-  void testExtensionPointDocumentation() {
-    myFixture.configureByFiles("extensionPointDocumentation.xml",
-                               "bar/MyExtensionPoint.java")
-
-    PsiElement originalElement = myFixture.getFile().findElementAt(myFixture.getCaretOffset())
-    PomTargetPsiElement pomTargetPsiElement = assertInstanceOf(myFixture.getElementAtCaret(), PomTargetPsiElement.class)
-    DomTarget domTarget = assertInstanceOf(pomTargetPsiElement.getTarget(), DomTarget.class)
-    PsiElement epPsiElement = domTarget.getNavigationElement()
-
-    DocumentationProvider provider = DocumentationManager.getProviderFromElement(epPsiElement)
-    String docBody = UIUtil.getHtmlBody(provider.generateDoc(epPsiElement, originalElement))
-    assertEquals("""<small><b>bar</b></small><PRE>public interface <b>MyExtensionPoint</b></PRE>
-   MyExtensionPoint JavaDoc.""", docBody)
-
-    assertEquals("""[$myModule.name] foo
-<b>bar</b> [extensionPointDocumentation.xml]
-bar.MyExtensionPoint""", provider.getQuickNavigateInfo(epPsiElement, originalElement))
-  }
-}
\ No newline at end of file
diff --git a/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.java b/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.java
new file mode 100644
index 000000000000..7cb0a30a0548
--- /dev/null
+++ b/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.java
@@ -0,0 +1,44 @@
+package org.jetbrains.idea.devkit.references.extensions;
+
+import com.intellij.codeInsight.documentation.DocumentationManager;
+import com.intellij.lang.documentation.DocumentationProvider;
+import com.intellij.openapi.application.PluginPathManager;
+import com.intellij.pom.PomTargetPsiElement;
+import com.intellij.psi.PsiElement;
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+import com.intellij.util.xml.DomTarget;
+
+public class ExtensionPointDocumentationProviderTest extends LightCodeInsightFixtureTestCase {
+  @Override
+  public String getBasePath() {
+    return PluginPathManager.getPluginHomePathRelative("devkit") + "/testData/references/extensions";
+  }
+
+  public void testExtensionPointDocumentation() {
+    myFixture.configureByFiles("extensionPointDocumentation.xml", "bar/MyExtensionPoint.java");
+
+    PsiElement originalElement = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
+    PomTargetPsiElement pomTargetPsiElement = assertInstanceOf(myFixture.getElementAtCaret(), PomTargetPsiElement.class);
+    DomTarget domTarget = assertInstanceOf(pomTargetPsiElement.getTarget(), DomTarget.class);
+    PsiElement epPsiElement = domTarget.getNavigationElement();
+
+    DocumentationProvider provider = DocumentationManager.getProviderFromElement(epPsiElement);
+
+    String epDefinition = "[" + myModule.getName() + "] foo<br/>" +
+                          "<b>bar</b> " +
+                          "[extensionPointDocumentation.xml]<br/>" +
+                          "<a href=\"psi_element://bar.MyExtensionPoint\"><code>MyExtensionPoint</code></a>";
+
+    assertEquals(epDefinition,
+                 provider.getQuickNavigateInfo(epPsiElement, originalElement));
+
+    assertEquals("<em>EP Definition</em><br/>" +
+                 epDefinition +
+                 "<br/><br/>" +
+                 "<em>EP Implementation</em>" +
+                 "<html><head>    <style type=\"text/css\">        #error {            background-color: #eeeeee;            margin-bottom: 10px;        }        p {            margin: 5px 0;        }    </style></head>" +
+                 "<body><small><b>bar</b></small><PRE>public interface <b>MyExtensionPoint</b></PRE>\n" +
+                 "   MyExtensionPoint JavaDoc.</body></html>",
+                 provider.generateDoc(epPsiElement, originalElement));
+  }
+}

From 0c781807dbc2816cbf60cff54a4b5bc09175d3dc Mon Sep 17 00:00:00 2001
From: Vyacheslav Karpukhin <Vyacheslav.Karpukhin@jetbrains.com>
Date: Fri, 24 Oct 2014 14:49:02 +0400
Subject: [PATCH 124/132] XmlPsiManager should not increase tracker on changes
 in unrelated files

---
 xml/xml-psi-impl/src/com/intellij/xml/XmlPsiManager.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/xml/xml-psi-impl/src/com/intellij/xml/XmlPsiManager.java b/xml/xml-psi-impl/src/com/intellij/xml/XmlPsiManager.java
index 3525a00163a7..b5c24bbe070b 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/XmlPsiManager.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/XmlPsiManager.java
@@ -21,7 +21,10 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFileSystemItem;
 import com.intellij.psi.impl.PsiManagerImpl;
+import com.intellij.psi.impl.PsiTreeChangeEventImpl;
 import com.intellij.psi.impl.PsiTreeChangePreprocessorBase;
+import com.intellij.psi.xml.XmlFile;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created by fedorkorotkov.
@@ -52,6 +55,12 @@ public class XmlPsiManager extends AbstractProjectComponent {
         // cause we display even attributes and tag values in structure view
         return !isXml;
       }
+
+      @Override
+      public void treeChanged(@NotNull PsiTreeChangeEventImpl event) {
+        if (!(event.getFile() instanceof XmlFile)) return;
+        super.treeChanged(event);
+      }
     };
   }
 }

From 9f9a64efa69eadeeeb63a18f4fddb49d3314efeb Mon Sep 17 00:00:00 2001
From: Sergey Simonchik <sergey.simonchik@jetbrains.com>
Date: Tue, 28 Oct 2014 01:21:25 +0400
Subject: [PATCH 125/132] html viewer doesn't need focus

---
 platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java b/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java
index 488c52d14207..bd2d7bc4a623 100644
--- a/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java
+++ b/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java
@@ -442,6 +442,7 @@ public class SwingHelper {
       textPane.setOpaque(false);
     }
     textPane.setForeground(foreground != null ? foreground : UIUtil.getLabelForeground());
+    textPane.setFocusable(false);
     return textPane;
   }
 

From d8915f5e02ee5cdce1f591e4eccf1ff80011cf0b Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Tue, 28 Oct 2014 00:58:08 +0300
Subject: [PATCH 126/132] UI: one simple way to control toolwindow toolbars
 visibility

---
 .../hierarchy/HierarchyBrowserManager.java    | 13 ++-
 .../ide/impl/StructureViewWrapperImpl.java    |  8 +-
 .../impl/StructureViewFactoryImpl.java        |  1 -
 .../StructureViewComponent.java               | 24 +-----
 .../usageView/impl/UsageViewManagerImpl.java  |  7 ++
 .../openapi/ui/SimpleToolWindowPanel.java     | 80 ++++++++++++++++++-
 .../changes/ui/ChangesViewContentManager.java |  7 ++
 7 files changed, 109 insertions(+), 31 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
index c0f156fedd28..7c7f9e7988a7 100644
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
@@ -18,12 +18,15 @@ package com.intellij.ide.hierarchy;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.impl.ContentManagerWatcher;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.openapi.wm.ex.ToolWindowEx;
 import com.intellij.ui.content.ContentManager;
 
 @State(
@@ -46,11 +49,15 @@ public final class HierarchyBrowserManager implements PersistentStateComponent<H
   private final ContentManager myContentManager;
 
   public HierarchyBrowserManager(final Project project) {
-    final ToolWindowManager toolWindowManager=ToolWindowManager.getInstance(project);
-    final ToolWindow toolWindow = toolWindowManager.registerToolWindow(ToolWindowId.HIERARCHY, true, ToolWindowAnchor.RIGHT, project);
+    ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(project);
+    ToolWindow toolWindow = toolWindowManager.registerToolWindow(ToolWindowId.HIERARCHY, true, ToolWindowAnchor.RIGHT, project);
+    DefaultActionGroup gearActions = new DefaultActionGroup();
+    gearActions.addAction(SimpleToolWindowPanel.createToggleToolbarAction(toolWindow)).setAsSecondary(true);
+    ((ToolWindowEx)toolWindow).setAdditionalGearActions(gearActions);
+
     myContentManager = toolWindow.getContentManager();
     toolWindow.setIcon(AllIcons.Toolwindows.ToolWindowHierarchy);
-    new ContentManagerWatcher(toolWindow,myContentManager);
+    new ContentManagerWatcher(toolWindow, myContentManager);
   }
 
   public final ContentManager getContentManager() {
diff --git a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
index 0830e9b8b22a..cfb3495f93ef 100644
--- a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
@@ -36,6 +36,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
@@ -69,6 +70,7 @@ import java.util.List;
 public class StructureViewWrapperImpl implements StructureViewWrapper, Disposable {
   private final Project myProject;
   private final ToolWindowEx myToolWindow;
+  private final AnAction myShowToolbarAction;
 
   private VirtualFile myFile;
 
@@ -90,6 +92,7 @@ public class StructureViewWrapperImpl implements StructureViewWrapper, Disposabl
   public StructureViewWrapperImpl(Project project, ToolWindowEx toolWindow) {
     myProject = project;
     myToolWindow = toolWindow;
+    myShowToolbarAction = SimpleToolWindowPanel.createToggleToolbarAction(myToolWindow);
 
     myUpdateQueue = new MergingUpdateQueue("StructureView", Registry.intValue("structureView.coalesceTime"), false, myToolWindow.getComponent(), this, myToolWindow.getComponent(), true);
     myUpdateQueue.setRestartTimerOnAdd(true);
@@ -365,12 +368,13 @@ public class StructureViewWrapperImpl implements StructureViewWrapper, Disposabl
   }
 
   private void updateHeaderActions(StructureView structureView) {
-    ActionGroup gearActions = null;
+    DefaultActionGroup gearActions = new DefaultActionGroup();
     AnAction[] titleActions = AnAction.EMPTY_ARRAY;
     if (structureView instanceof StructureViewComponent) {
-      gearActions = ((StructureViewComponent)structureView).getGearActions();
+      gearActions.addAll(((StructureViewComponent)structureView).getGearActions());
       titleActions = ((StructureViewComponent)structureView).getTitleActions();
     }
+    gearActions.addAction(myShowToolbarAction).setAsSecondary(true);
     myToolWindow.setAdditionalGearActions(gearActions);
     myToolWindow.setTitleActions(titleActions);
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewFactoryImpl.java b/platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewFactoryImpl.java
index 7d7990a06a41..b350d1f330c9 100644
--- a/platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewFactoryImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewFactoryImpl.java
@@ -54,7 +54,6 @@ public final class StructureViewFactoryImpl extends StructureViewFactoryEx imple
     @SuppressWarnings({"WeakerAccess"}) public boolean AUTOSCROLL_MODE = true;
     @SuppressWarnings({"WeakerAccess"}) public boolean AUTOSCROLL_FROM_SOURCE = false;
     @SuppressWarnings({"WeakerAccess"}) public String ACTIVE_ACTIONS = "";
-    public boolean SHOW_TOOLBAR = false;
   }
 
   private final Project myProject;
diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
index 6363a299539e..3e9eabbfbaa7 100644
--- a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
+++ b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
@@ -154,9 +154,7 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
     myAutoScrollToSourceHandler = new MyAutoScrollToSourceHandler();
     myAutoScrollFromSourceHandler = new MyAutoScrollFromSourceHandler(myProject, this);
 
-    if (getSettings().SHOW_TOOLBAR) {
-      setToolbar(createToolbar());
-    }
+    setToolbar(createToolbar());
 
     installTree();
 
@@ -390,25 +388,7 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
   }
 
   public ActionGroup getGearActions() {
-    DefaultActionGroup group = createActionGroup(true);
-    group.addAction(new ToggleAction("Show Toolbar") {
-      @Override
-      public boolean isDumbAware() {
-        return true;
-      }
-
-      @Override
-      public boolean isSelected(AnActionEvent e) {
-        return getSettings().SHOW_TOOLBAR;
-      }
-
-      @Override
-      public void setSelected(AnActionEvent e, boolean state) {
-        setToolbar(state ? createToolbar() : null);
-        getSettings().SHOW_TOOLBAR = state;
-      }
-    }).setAsSecondary(true);
-    return group;
+    return createActionGroup(true);
   }
 
   private StructureViewFactoryImpl.State getSettings() {
diff --git a/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java b/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
index b2ee89c11e2e..73ae0e34b6c9 100644
--- a/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
@@ -18,12 +18,15 @@ package com.intellij.usageView.impl;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.impl.ContentManagerWatcher;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.openapi.wm.ex.ToolWindowEx;
 import com.intellij.ui.content.*;
 import com.intellij.usageView.UsageViewManager;
 import com.intellij.usages.UsageView;
@@ -41,6 +44,10 @@ public class UsageViewManagerImpl extends UsageViewManager {
     ToolWindow toolWindow = toolWindowManager.registerToolWindow(ToolWindowId.FIND, true, ToolWindowAnchor.BOTTOM, project, true);
     toolWindow.setToHideOnEmptyContent(true);
     toolWindow.setIcon(AllIcons.Toolwindows.ToolWindowFind);
+    DefaultActionGroup gearActions = new DefaultActionGroup();
+    gearActions.addAction(SimpleToolWindowPanel.createToggleToolbarAction(toolWindow)).setAsSecondary(true);
+    ((ToolWindowEx)toolWindow).setAdditionalGearActions(gearActions);
+
     myFindContentManager = toolWindow.getContentManager();
     myFindContentManager.addContentManagerListener(new ContentManagerAdapter() {
       @Override
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java b/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java
index 751d41eab358..5e5101da7bc3 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java
@@ -15,20 +15,27 @@
  */
 package com.intellij.openapi.ui;
 
-import com.intellij.openapi.actionSystem.ActionToolbar;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.util.Ref;
+import com.intellij.openapi.wm.ToolWindow;
+import com.intellij.ui.content.Content;
+import com.intellij.ui.content.ContentManagerAdapter;
+import com.intellij.ui.content.ContentManagerEvent;
 import com.intellij.ui.switcher.QuickActionProvider;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.AwtVisitor;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ContainerAdapter;
 import java.awt.event.ContainerEvent;
+import java.util.LinkedList;
 import java.util.List;
 
 public class SimpleToolWindowPanel extends JPanel implements QuickActionProvider, DataProvider {
@@ -74,6 +81,10 @@ public class SimpleToolWindowPanel extends JPanel implements QuickActionProvider
     });
   }
 
+  public boolean isToolbarVisible() {
+    return myToolbar != null && myToolbar.isVisible();
+  }
+
   public void setToolbar(@Nullable JComponent c) {
     if (c == null) {
       remove(myToolbar);
@@ -159,4 +170,67 @@ public class SimpleToolWindowPanel extends JPanel implements QuickActionProvider
       }
     }
   }
+
+  @NotNull
+  public static AnAction createToggleToolbarAction(@NotNull ToolWindow toolWindow) {
+    return new ToggleToolbarAction(toolWindow, PropertiesComponent.getInstance());
+  }
+
+  private static class ToggleToolbarAction extends ToggleAction implements DumbAware {
+
+    private final PropertiesComponent myPropertiesComponent;
+    private final ToolWindow myToolWindow;
+
+    private ToggleToolbarAction(@NotNull ToolWindow toolWindow, @NotNull PropertiesComponent propertiesComponent) {
+      super("Show Toolbar");
+      myPropertiesComponent = propertiesComponent;
+      myToolWindow = toolWindow;
+      myToolWindow.getContentManager().addContentManagerListener(new ContentManagerAdapter() {
+        @Override
+        public void contentAdded(ContentManagerEvent event) {
+          setContentToolbarVisible(event.getContent(), getVisibilityValue());
+        }
+      });
+    }
+
+    @Override
+    public boolean isSelected(AnActionEvent e) {
+      return getVisibilityValue();
+    }
+
+    @Override
+    public void setSelected(AnActionEvent e, boolean state) {
+      myPropertiesComponent.setValue(getProperty(), String.valueOf(state), String.valueOf(true));
+      for (Content content : myToolWindow.getContentManager().getContents()) {
+        setContentToolbarVisible(content, state);
+      }
+    }
+
+    @NotNull
+    private String getProperty() {
+      return myToolWindow.getStripeTitle() + ".ShowToolbar";
+    }
+
+    private boolean getVisibilityValue() {
+      return myPropertiesComponent.getBoolean(getProperty(), true);
+    }
+
+    private static void setContentToolbarVisible(Content content, boolean state) {
+      LinkedList<JComponent> deque = ContainerUtil.newLinkedList(content.getComponent());
+      while(!deque.isEmpty()) {
+        JComponent component = deque.pollFirst();
+        if (!(component instanceof JPanel)) continue;
+
+        for (int i = 0, count = component.getComponentCount(); i < count; i++) {
+          Component c = component.getComponent(i);
+          if (c instanceof ActionToolbar) {
+            c.setVisible(state);
+          }
+          else if (c instanceof JPanel) {
+            deque.addLast((JPanel)c);
+          }
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
index 297408c3ec24..96e62cfa7cb0 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
@@ -19,6 +19,7 @@ package com.intellij.openapi.vcs.changes.ui;
 import com.intellij.icons.AllIcons;
 import com.intellij.lifecycle.PeriodicalTasksCloser;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.components.AbstractProjectComponent;
@@ -26,6 +27,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.DumbAwareRunnable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.startup.StartupManager;
+import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
@@ -36,6 +38,7 @@ import com.intellij.openapi.vcs.VcsListener;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.openapi.wm.ex.ToolWindowEx;
 import com.intellij.ui.content.*;
 import com.intellij.util.Alarm;
 import com.intellij.util.NotNullFunction;
@@ -83,6 +86,10 @@ public class ChangesViewContentManager extends AbstractProjectComponent implemen
         if (toolWindowManager != null) {
           myToolWindow = toolWindowManager.registerToolWindow(TOOLWINDOW_ID, true, ToolWindowAnchor.BOTTOM, myProject, true);
           myToolWindow.setIcon(AllIcons.Toolwindows.ToolWindowChanges);
+          DefaultActionGroup gearActions = new DefaultActionGroup();
+          gearActions.addAction(SimpleToolWindowPanel.createToggleToolbarAction(myToolWindow)).setAsSecondary(true);
+          ((ToolWindowEx)myToolWindow).setAdditionalGearActions(gearActions);
+
           updateToolWindowAvailability();
           final ContentManager contentManager = myToolWindow.getContentManager();
           myContentManagerListener = new MyContentManagerListener();

From c3faa89b21ab8a7ec9ed936680ada32afb521d74 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Tue, 28 Oct 2014 01:46:08 +0300
Subject: [PATCH 127/132] UI: one simple way to control toolwindow toolbars
 visibility 2

---
 .../com/intellij/ide/hierarchy/HierarchyBrowserManager.java  | 2 +-
 .../src/com/intellij/ide/impl/StructureViewWrapperImpl.java  | 2 +-
 .../com/intellij/usageView/impl/UsageViewManagerImpl.java    | 2 +-
 .../src/com/intellij/openapi/ui/SimpleToolWindowPanel.java   | 5 +++--
 .../openapi/vcs/changes/ui/ChangesViewContentManager.java    | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
index 7c7f9e7988a7..595907aa5720 100644
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
@@ -52,7 +52,7 @@ public final class HierarchyBrowserManager implements PersistentStateComponent<H
     ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(project);
     ToolWindow toolWindow = toolWindowManager.registerToolWindow(ToolWindowId.HIERARCHY, true, ToolWindowAnchor.RIGHT, project);
     DefaultActionGroup gearActions = new DefaultActionGroup();
-    gearActions.addAction(SimpleToolWindowPanel.createToggleToolbarAction(toolWindow)).setAsSecondary(true);
+    gearActions.addAction(SimpleToolWindowPanel.createToggleToolbarAction(project, toolWindow)).setAsSecondary(true);
     ((ToolWindowEx)toolWindow).setAdditionalGearActions(gearActions);
 
     myContentManager = toolWindow.getContentManager();
diff --git a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
index cfb3495f93ef..ecdc9dd73da0 100644
--- a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
@@ -92,7 +92,7 @@ public class StructureViewWrapperImpl implements StructureViewWrapper, Disposabl
   public StructureViewWrapperImpl(Project project, ToolWindowEx toolWindow) {
     myProject = project;
     myToolWindow = toolWindow;
-    myShowToolbarAction = SimpleToolWindowPanel.createToggleToolbarAction(myToolWindow);
+    myShowToolbarAction = SimpleToolWindowPanel.createToggleToolbarAction(project, myToolWindow);
 
     myUpdateQueue = new MergingUpdateQueue("StructureView", Registry.intValue("structureView.coalesceTime"), false, myToolWindow.getComponent(), this, myToolWindow.getComponent(), true);
     myUpdateQueue.setRestartTimerOnAdd(true);
diff --git a/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java b/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
index 73ae0e34b6c9..bf76c18e94d5 100644
--- a/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
@@ -45,7 +45,7 @@ public class UsageViewManagerImpl extends UsageViewManager {
     toolWindow.setToHideOnEmptyContent(true);
     toolWindow.setIcon(AllIcons.Toolwindows.ToolWindowFind);
     DefaultActionGroup gearActions = new DefaultActionGroup();
-    gearActions.addAction(SimpleToolWindowPanel.createToggleToolbarAction(toolWindow)).setAsSecondary(true);
+    gearActions.addAction(SimpleToolWindowPanel.createToggleToolbarAction(project, toolWindow)).setAsSecondary(true);
     ((ToolWindowEx)toolWindow).setAdditionalGearActions(gearActions);
 
     myFindContentManager = toolWindow.getContentManager();
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java b/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java
index 5e5101da7bc3..c4523819c0f1 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java
@@ -18,6 +18,7 @@ package com.intellij.openapi.ui;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.ui.content.Content;
@@ -172,8 +173,8 @@ public class SimpleToolWindowPanel extends JPanel implements QuickActionProvider
   }
 
   @NotNull
-  public static AnAction createToggleToolbarAction(@NotNull ToolWindow toolWindow) {
-    return new ToggleToolbarAction(toolWindow, PropertiesComponent.getInstance());
+  public static AnAction createToggleToolbarAction(Project project, @NotNull ToolWindow toolWindow) {
+    return new ToggleToolbarAction(toolWindow, PropertiesComponent.getInstance(project));
   }
 
   private static class ToggleToolbarAction extends ToggleAction implements DumbAware {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
index 96e62cfa7cb0..7801b7f80b45 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
@@ -87,7 +87,7 @@ public class ChangesViewContentManager extends AbstractProjectComponent implemen
           myToolWindow = toolWindowManager.registerToolWindow(TOOLWINDOW_ID, true, ToolWindowAnchor.BOTTOM, myProject, true);
           myToolWindow.setIcon(AllIcons.Toolwindows.ToolWindowChanges);
           DefaultActionGroup gearActions = new DefaultActionGroup();
-          gearActions.addAction(SimpleToolWindowPanel.createToggleToolbarAction(myToolWindow)).setAsSecondary(true);
+          gearActions.addAction(SimpleToolWindowPanel.createToggleToolbarAction(myProject, myToolWindow)).setAsSecondary(true);
           ((ToolWindowEx)myToolWindow).setAdditionalGearActions(gearActions);
 
           updateToolWindowAvailability();

From 2c3e37ab0f55d8cedd58269e12e44b0507ec2f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20C=C3=A9bron?= <yann.cebron@jetbrains.com>
Date: Tue, 28 Oct 2014 08:22:40 +0100
Subject: [PATCH 128/132] IDEA-131862 Missing quick doc in extension tag
 completion

---
 .../ExtensionPointDocumentationProvider.java  | 28 +++++++++----------
 ...tensionPointDocumentationProviderTest.java | 16 ++++-------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/plugins/devkit/src/references/extensions/ExtensionPointDocumentationProvider.java b/plugins/devkit/src/references/extensions/ExtensionPointDocumentationProvider.java
index cc9f3ed3ab26..2ce1c27e6e38 100644
--- a/plugins/devkit/src/references/extensions/ExtensionPointDocumentationProvider.java
+++ b/plugins/devkit/src/references/extensions/ExtensionPointDocumentationProvider.java
@@ -18,21 +18,19 @@ package org.jetbrains.idea.devkit.references.extensions;
 import com.intellij.codeInsight.javadoc.JavaDocInfoGenerator;
 import com.intellij.lang.documentation.DocumentationProviderEx;
 import com.intellij.lang.java.JavaDocumentationProvider;
-import com.intellij.lang.xml.XMLLanguage;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.pom.PomTarget;
+import com.intellij.pom.PomTargetPsiElement;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTypesUtil;
 import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlToken;
-import com.intellij.psi.xml.XmlTokenType;
 import com.intellij.util.xml.DomElement;
+import com.intellij.util.xml.DomTarget;
 import com.intellij.util.xml.DomUtil;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.idea.devkit.dom.Extension;
 import org.jetbrains.idea.devkit.dom.ExtensionPoint;
 import org.jetbrains.idea.devkit.util.DescriptorUtil;
 
@@ -43,7 +41,7 @@ public class ExtensionPointDocumentationProvider extends DocumentationProviderEx
 
   @Override
   public String getQuickNavigateInfo(PsiElement element, PsiElement originalElement) {
-    ExtensionPoint extensionPoint = findExtensionPoint(originalElement);
+    ExtensionPoint extensionPoint = findExtensionPoint(element);
     if (extensionPoint == null) return null;
 
     final XmlFile epDeclarationFile = (XmlFile)extensionPoint.getXmlTag().getContainingFile();
@@ -69,7 +67,7 @@ public class ExtensionPointDocumentationProvider extends DocumentationProviderEx
 
   @Override
   public String generateDoc(PsiElement element, @Nullable PsiElement originalElement) {
-    ExtensionPoint extensionPoint = findExtensionPoint(originalElement);
+    ExtensionPoint extensionPoint = findExtensionPoint(element);
     if (extensionPoint == null) return null;
 
     final PsiClass epClass = getExtensionPointClass(extensionPoint);
@@ -89,15 +87,15 @@ public class ExtensionPointDocumentationProvider extends DocumentationProviderEx
   }
 
   @Nullable
-  private static ExtensionPoint findExtensionPoint(@Nullable PsiElement element) {
-    if (element == null) return null;
-    if (element.getLanguage() == XMLLanguage.INSTANCE &&
-        (element instanceof XmlTag ||
-         element instanceof XmlToken && ((XmlToken)element).getTokenType() == XmlTokenType.XML_NAME) &&
+  private static ExtensionPoint findExtensionPoint(PsiElement element) {
+    if (element instanceof PomTargetPsiElement &&
         DescriptorUtil.isPluginXml(element.getContainingFile())) {
-      final DomElement domElement = DomUtil.getDomElement(element);
-      if (domElement instanceof Extension) {
-        return ((Extension)domElement).getExtensionPoint();
+      final PomTarget pomTarget = ((PomTargetPsiElement)element).getTarget();
+      if (pomTarget instanceof DomTarget) {
+        final DomElement domElement = ((DomTarget)pomTarget).getDomElement();
+        if (domElement instanceof ExtensionPoint) {
+          return (ExtensionPoint)domElement;
+        }
       }
     }
     return null;
diff --git a/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.java b/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.java
index 7cb0a30a0548..a9c16ec0335a 100644
--- a/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.java
+++ b/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.java
@@ -3,10 +3,8 @@ package org.jetbrains.idea.devkit.references.extensions;
 import com.intellij.codeInsight.documentation.DocumentationManager;
 import com.intellij.lang.documentation.DocumentationProvider;
 import com.intellij.openapi.application.PluginPathManager;
-import com.intellij.pom.PomTargetPsiElement;
 import com.intellij.psi.PsiElement;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
-import com.intellij.util.xml.DomTarget;
 
 public class ExtensionPointDocumentationProviderTest extends LightCodeInsightFixtureTestCase {
   @Override
@@ -17,12 +15,10 @@ public class ExtensionPointDocumentationProviderTest extends LightCodeInsightFix
   public void testExtensionPointDocumentation() {
     myFixture.configureByFiles("extensionPointDocumentation.xml", "bar/MyExtensionPoint.java");
 
-    PsiElement originalElement = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
-    PomTargetPsiElement pomTargetPsiElement = assertInstanceOf(myFixture.getElementAtCaret(), PomTargetPsiElement.class);
-    DomTarget domTarget = assertInstanceOf(pomTargetPsiElement.getTarget(), DomTarget.class);
-    PsiElement epPsiElement = domTarget.getNavigationElement();
-
-    DocumentationProvider provider = DocumentationManager.getProviderFromElement(epPsiElement);
+    final PsiElement docElement =
+      DocumentationManager.getInstance(getProject()).findTargetElement(myFixture.getEditor(),
+                                                                       myFixture.getFile());
+    DocumentationProvider provider = DocumentationManager.getProviderFromElement(docElement);
 
     String epDefinition = "[" + myModule.getName() + "] foo<br/>" +
                           "<b>bar</b> " +
@@ -30,7 +26,7 @@ public class ExtensionPointDocumentationProviderTest extends LightCodeInsightFix
                           "<a href=\"psi_element://bar.MyExtensionPoint\"><code>MyExtensionPoint</code></a>";
 
     assertEquals(epDefinition,
-                 provider.getQuickNavigateInfo(epPsiElement, originalElement));
+                 provider.getQuickNavigateInfo(docElement, null));
 
     assertEquals("<em>EP Definition</em><br/>" +
                  epDefinition +
@@ -39,6 +35,6 @@ public class ExtensionPointDocumentationProviderTest extends LightCodeInsightFix
                  "<html><head>    <style type=\"text/css\">        #error {            background-color: #eeeeee;            margin-bottom: 10px;        }        p {            margin: 5px 0;        }    </style></head>" +
                  "<body><small><b>bar</b></small><PRE>public interface <b>MyExtensionPoint</b></PRE>\n" +
                  "   MyExtensionPoint JavaDoc.</body></html>",
-                 provider.generateDoc(epPsiElement, originalElement));
+                 provider.generateDoc(docElement, null));
   }
 }

From d679f53a3b063e950042f5062c68bc8aebea2575 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 27 Oct 2014 17:12:10 +0100
Subject: [PATCH 129/132] continue Firefox RDP

---
 .../protocolReader/FieldProcessor.java        | 99 +++++++++++--------
 .../protocolReader/InterfaceReader.java       |  2 -
 .../protocolReader/MethodHandler.java         | 10 +-
 .../PreparsedFieldMethodHandler.java          | 21 ----
 .../protocolReader/PrimitiveValueReader.java  |  6 +-
 .../protocolReader/ReadDelegate.java          |  2 +-
 .../protocolReader/ReaderGenerator.java       |  1 +
 .../jetbrains/protocolReader/ReaderRoot.java  |  6 +-
 .../jetbrains/protocolReader/TypeHandler.java |  4 +-
 9 files changed, 73 insertions(+), 78 deletions(-)
 delete mode 100644 platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PreparsedFieldMethodHandler.java

diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java
index 77a91e8543d1..3925239a98d2 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java
@@ -10,22 +10,17 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.*;
 
-class FieldProcessor<T> {
-  private final Class<T> typeClass;
-
+final class FieldProcessor<T> {
   private final List<FieldLoader> fieldLoaders = new ArrayList<>(2);
   private final LinkedHashMap<Method, MethodHandler> methodHandlerMap = new LinkedHashMap<>();
   private final List<VolatileFieldBinding> volatileFields = new ArrayList<>(2);
   boolean lazyRead;
   private final InterfaceReader reader;
 
-  FieldProcessor(InterfaceReader reader, Class<T> typeClass) {
-    this.typeClass = typeClass;
+  FieldProcessor(@NotNull InterfaceReader reader, @NotNull Class<T> typeClass) {
     this.reader = reader;
-  }
 
-  void go() {
-    Method[] methods = typeClass.getDeclaredMethods();
+    Method[] methods = typeClass.getMethods();
     // todo sort by source location
     Arrays.sort(methods, new Comparator<Method>() {
       @Override
@@ -34,58 +29,77 @@ class FieldProcessor<T> {
       }
     });
 
-    for (Method m : methods) {
+    Package aPackage = typeClass.getPackage();
+    for (Method method : methods) {
+      Class<?> methodClass = method.getDeclaringClass();
+      // use method from super if super located in the same package
+      if (methodClass != typeClass && methodClass.getPackage() != aPackage) {
+        continue;
+      }
+
+      if (method.getParameterTypes().length != 0) {
+        throw new JsonProtocolModelParseException("No parameters expected in " + method);
+      }
+
       try {
-        processMethod(m);
+        String fieldName = checkAndGetJsonFieldName(method);
+        MethodHandler methodHandler;
+
+        JsonSubtypeCasting jsonSubtypeCaseAnnotation = method.getAnnotation(JsonSubtypeCasting.class);
+        if (jsonSubtypeCaseAnnotation != null) {
+          methodHandler = processManualSubtypeMethod(method, jsonSubtypeCaseAnnotation);
+          lazyRead = true;
+        }
+        else {
+          methodHandler = processFieldGetterMethod(method, fieldName);
+        }
+        methodHandlerMap.put(method, methodHandler);
       }
       catch (JsonProtocolModelParseException e) {
-        throw new JsonProtocolModelParseException("Problem with method " + m, e);
+        throw new JsonProtocolModelParseException("Problem with method " + method, e);
       }
     }
   }
 
-  private void processMethod(Method m) {
-    if (m.getParameterTypes().length != 0) {
-      throw new JsonProtocolModelParseException("No parameters expected in " + m);
-    }
-    String fieldName = checkAndGetJsonFieldName(m);
-    MethodHandler methodHandler;
-
-    JsonSubtypeCasting jsonSubtypeCaseAnnotation = m.getAnnotation(JsonSubtypeCasting.class);
-    if (jsonSubtypeCaseAnnotation != null) {
-      methodHandler = processManualSubtypeMethod(m, jsonSubtypeCaseAnnotation);
-      lazyRead = true;
-    }
-    else {
-      methodHandler = processFieldGetterMethod(m, fieldName);
-    }
-    methodHandlerMap.put(m, methodHandler);
-  }
-
-  private MethodHandler processFieldGetterMethod(Method m, String fieldName) {
-    Type genericReturnType = m.getGenericReturnType();
+  private MethodHandler processFieldGetterMethod(@NotNull Method method, @NotNull String fieldName) {
+    Type genericReturnType = method.getGenericReturnType();
     boolean nullable;
-    if (m.getAnnotation(JsonNullable.class) != null) {
+    if (method.getAnnotation(JsonNullable.class) != null) {
       nullable = true;
     }
     else if (genericReturnType == String.class || genericReturnType == Enum.class) {
-      JsonField jsonField = m.getAnnotation(JsonField.class);
+      JsonField jsonField = method.getAnnotation(JsonField.class);
       if (jsonField != null) {
         nullable = jsonField.optional() && !jsonField.allowAnyPrimitiveValue() && !jsonField.allowAnyPrimitiveValueAndMap();
       }
       else {
-        nullable = m.getAnnotation(JsonOptionalField.class) != null;
+        nullable = method.getAnnotation(JsonOptionalField.class) != null;
       }
     }
     else {
       nullable = false;
     }
 
-    ValueReader fieldTypeParser = reader.getFieldTypeParser(genericReturnType, nullable, false, m);
+    ValueReader fieldTypeParser = reader.getFieldTypeParser(genericReturnType, nullable, false, method);
     if (fieldTypeParser != InterfaceReader.VOID_PARSER) {
       fieldLoaders.add(new FieldLoader(fieldName, fieldTypeParser));
     }
-    return new PreparsedFieldMethodHandler(fieldTypeParser == InterfaceReader.VOID_PARSER ? null : fieldName);
+
+    final String effectiveFieldName = fieldTypeParser == InterfaceReader.VOID_PARSER ? null : fieldName;
+    return new MethodHandler() {
+      @Override
+      void writeMethodImplementationJava(@NotNull ClassScope scope, @NotNull Method method, @NotNull TextOutput out) {
+        if (!nullable) {
+          out.append("@NotNull").newLine();
+        }
+        writeMethodDeclarationJava(out, method);
+        out.openBlock();
+        if (effectiveFieldName != null) {
+          out.append("return ").append(FieldLoader.FIELD_PREFIX).append(effectiveFieldName).semi();
+        }
+        out.closeBlock();
+      }
+    };
   }
 
   private MethodHandler processManualSubtypeMethod(final Method m, JsonSubtypeCasting jsonSubtypeCaseAnn) {
@@ -131,17 +145,18 @@ class FieldProcessor<T> {
     return binding;
   }
 
-  private static String checkAndGetJsonFieldName(Method m) {
-    if (m.getParameterTypes().length != 0) {
+  @NotNull
+  private static String checkAndGetJsonFieldName(@NotNull Method method) {
+    if (method.getParameterTypes().length != 0) {
       throw new JsonProtocolModelParseException("Must have 0 parameters");
     }
-    JsonField fieldAnn = m.getAnnotation(JsonField.class);
-    if (fieldAnn != null) {
-      String jsonLiteralName = fieldAnn.jsonLiteralName();
+    JsonField fieldAnnotation = method.getAnnotation(JsonField.class);
+    if (fieldAnnotation != null) {
+      String jsonLiteralName = fieldAnnotation.jsonLiteralName();
       if (!jsonLiteralName.isEmpty()) {
         return jsonLiteralName;
       }
     }
-    return m.getName();
+    return method.getName();
   }
 }
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/InterfaceReader.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/InterfaceReader.java
index a02b4ae8f18a..2cb6b9a28d07 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/InterfaceReader.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/InterfaceReader.java
@@ -161,8 +161,6 @@ class InterfaceReader {
     }
 
     FieldProcessor<T> fields = new FieldProcessor<>(this, typeClass);
-    fields.go();
-
     LinkedHashMap<Method, MethodHandler> methodHandlerMap = fields.getMethodHandlerMap();
     for (Method method : methodHandlerMap.keySet()) {
       Class<?> returnType = method.getReturnType();
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/MethodHandler.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/MethodHandler.java
index a877b654c020..a9caa4e22929 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/MethodHandler.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/MethodHandler.java
@@ -14,10 +14,10 @@ import java.util.List;
 abstract class MethodHandler {
   abstract void writeMethodImplementationJava(ClassScope classScope, Method m, TextOutput out);
 
-  protected static void appendMethodSignatureJava(@NotNull Method m, @NotNull List<String> paramNames, @NotNull TextOutput out) {
-    out.append(m.getName()).append('(');
+  protected static void appendMethodSignatureJava(@NotNull Method method, @NotNull List<String> paramNames, @NotNull TextOutput out) {
+    out.append(method.getName()).append('(');
     boolean firstArg = true;
-    Type[] types = m.getGenericParameterTypes();
+    Type[] types = method.getGenericParameterTypes();
     for (int i = 0, length = types.length; i < length; i++) {
       Type arg = types[i];
       if (firstArg) {
@@ -32,8 +32,8 @@ abstract class MethodHandler {
     out.append(')');
   }
 
-  protected static void writeMethodDeclarationJava(TextOutput out, Method m) {
-    writeMethodDeclarationJava(out, m, Collections.<String>emptyList());
+  protected static void writeMethodDeclarationJava(TextOutput out, Method method) {
+    writeMethodDeclarationJava(out, method, Collections.<String>emptyList());
   }
 
   protected static void writeMethodDeclarationJava(@NotNull TextOutput out, @NotNull Method m, @NotNull List<String> paramNames) {
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PreparsedFieldMethodHandler.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PreparsedFieldMethodHandler.java
deleted file mode 100644
index 19e7714a0bd2..000000000000
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PreparsedFieldMethodHandler.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import java.lang.reflect.Method;
-
-class PreparsedFieldMethodHandler extends MethodHandler {
-  private final String fieldName;
-
-  PreparsedFieldMethodHandler(String fieldName) {
-    this.fieldName = fieldName;
-  }
-
-  @Override
-  void writeMethodImplementationJava(ClassScope scope, Method m, TextOutput out) {
-    writeMethodDeclarationJava(out, m);
-    out.openBlock();
-    if (fieldName != null) {
-      out.append("return ").append(FieldLoader.FIELD_PREFIX).append(fieldName).semi();
-    }
-    out.closeBlock();
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PrimitiveValueReader.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PrimitiveValueReader.java
index 5e53088b9b39..4f950fc4bb44 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PrimitiveValueReader.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PrimitiveValueReader.java
@@ -38,11 +38,13 @@ class PrimitiveValueReader extends ValueReader {
     if (asRawString) {
       out.append("readRawString(");
       addReaderParameter(subtyping, out);
+      out.append(')');
     }
     else {
-      beginReadCall(readPostfix, subtyping, out, fieldName);
+      ValueReader.addReaderParameter(subtyping, out);
+      out.append(".next").append(readPostfix).append("()");
+      //beginReadCall(readPostfix, subtyping, out, fieldName);
     }
-    out.append(')');
   }
 
   @Override
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReadDelegate.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReadDelegate.java
index 56dcc310fa83..ca3253b1595b 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReadDelegate.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReadDelegate.java
@@ -23,7 +23,7 @@ class ReadDelegate {
     paramNames = hasNextNameParam ? STATIC_METHOD_PARAM_NAME_LIST2 : STATIC_METHOD_PARAM_NAME_LIST;
   }
 
-  void write(ClassScope scope, Method method, TextOutput out) {
+  void write(@NotNull ClassScope scope, @NotNull Method method, @NotNull TextOutput out) {
     MethodHandler.writeMethodDeclarationJava(out, method, paramNames);
     out.openBlock();
     out.append("return ");
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderGenerator.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderGenerator.java
index c51ae4c55e0f..71150f1fad79 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderGenerator.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderGenerator.java
@@ -121,6 +121,7 @@ public final class ReaderGenerator {
     out.append("// Generated source");
     out.newLine().append("package ").append(configuration.packageName).append(';');
     out.newLine().newLine().append("import org.jetbrains.jsonProtocol.*;");
+    out.newLine().newLine().append("import org.jetbrains.annotations.NotNull;");
     out.newLine().newLine().append("import static org.jetbrains.jsonProtocol.JsonReaders.*;");
     out.newLine().newLine().append("public final class ").append(configuration.className).space();
     out.append(configuration.root.getType().isInterface() ? "implements" : "extends").space().append(configuration.root.getType().getCanonicalName()).openBlock(false);
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderRoot.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderRoot.java
index f7ce9eb9eb39..8a480f9ec819 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderRoot.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderRoot.java
@@ -94,11 +94,11 @@ class ReaderRoot<R> {
     return rootClass;
   }
 
-  public void writeStaticMethodJava(ClassScope scope) {
+  public void writeStaticMethodJava(@NotNull ClassScope scope) {
     TextOutput out = scope.getOutput();
-    for (Map.Entry<Method, ReadDelegate> en : methodMap.entrySet()) {
+    for (Map.Entry<Method, ReadDelegate> entry : methodMap.entrySet()) {
       out.newLine();
-      en.getValue().write(scope, en.getKey(), out);
+      entry.getValue().write(scope, entry.getKey(), out);
       out.newLine();
     }
   }
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/TypeHandler.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/TypeHandler.java
index 261b0e94e07c..983ce0c69d01 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/TypeHandler.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/TypeHandler.java
@@ -93,9 +93,9 @@ class TypeHandler<T> {
       subtypeAspect.writeParseMethod(valueImplClassName, classScope, out);
     }
 
-    for (Map.Entry<Method, MethodHandler> en : methodHandlerMap.entrySet()) {
+    for (Map.Entry<Method, MethodHandler> entry : methodHandlerMap.entrySet()) {
       out.newLine();
-      en.getValue().writeMethodImplementationJava(classScope, en.getKey(), out);
+      entry.getValue().writeMethodImplementationJava(classScope, entry.getKey(), out);
       out.newLine();
     }
 

From 2b15af802372eea188dd7e3e6fc20b086543c0c8 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 28 Oct 2014 11:52:57 +0300
Subject: [PATCH 130/132] IDEA-131993 Debugger: arrays/collections: "more
 items" specifies wrong value

---
 .../src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
index f7f05fcc496f..e66990a04775 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
@@ -192,7 +192,7 @@ public class ArrayRenderer extends NodeRendererImpl{
 
         if(!myForced && END_INDEX < array.length() - 1) {
           //children.add(nodeManager.createMessageNode(new MessageDescriptor(MORE_ELEMENTS, MessageDescriptor.SPECIAL)));
-          builder.setRemaining(array.length()-END_INDEX);
+          builder.setRemaining(array.length()-1-END_INDEX);
         }
       }
     }

From 4a6142a813d91233aba4616b91069de550bccaa8 Mon Sep 17 00:00:00 2001
From: Vyacheslav Karpukhin <Vyacheslav.Karpukhin@jetbrains.com>
Date: Tue, 28 Oct 2014 12:12:50 +0300
Subject: [PATCH 131/132] JsonTreeChangePreprocessor should not increase
 tracker on changes in unrelated files

---
 .../com/intellij/json/psi/impl/JsonTreeChangePreprocessor.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/json/src/com/intellij/json/psi/impl/JsonTreeChangePreprocessor.java b/json/src/com/intellij/json/psi/impl/JsonTreeChangePreprocessor.java
index 5f51296b37d9..6bb2ee9ee166 100644
--- a/json/src/com/intellij/json/psi/impl/JsonTreeChangePreprocessor.java
+++ b/json/src/com/intellij/json/psi/impl/JsonTreeChangePreprocessor.java
@@ -1,6 +1,7 @@
 package com.intellij.json.psi.impl;
 
 import com.intellij.json.JsonLanguage;
+import com.intellij.json.psi.JsonFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiFileSystemItem;
@@ -20,6 +21,8 @@ public class JsonTreeChangePreprocessor implements PsiTreeChangePreprocessor {
    */
   @Override
   public void treeChanged(@NotNull PsiTreeChangeEventImpl event) {
+    if (!(event.getFile() instanceof JsonFile)) return;
+
     final PsiElement element = event.getParent();
     if (element == null || !(element.getManager() instanceof PsiManagerImpl)) {
       return;

From 20efa841997af02335b6e473a1c194d4102cf945 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Tue, 28 Oct 2014 12:32:09 +0300
Subject: [PATCH 132/132] DSGN-869 New icons for task management

---
 plugins/tasks/tasks-core/src/icons/clock.png    | Bin 655 -> 633 bytes
 plugins/tasks/tasks-core/src/icons/clock@2x.png | Bin 0 -> 1462 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 plugins/tasks/tasks-core/src/icons/clock@2x.png

diff --git a/plugins/tasks/tasks-core/src/icons/clock.png b/plugins/tasks/tasks-core/src/icons/clock.png
index d9cbbfc508a1980c5b72be0c640c65d0c56b56cd..701863c24cd44791889496ee30b65f2931b93c99 100644
GIT binary patch
delta 609
zcmV-n0-pVk1^EP!BYyxHbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!
z8%ab#RCwBSQqODCa1_rs`KIY&*I3fpHErq!9h(*DVTU2s9Yn#yJiDTJa+l77`vV03
z1rJqW$ANhCpa>omW-ls3hUm5;PCA>d#?U3UX_{YOzi+gcfq#LQ_kAy)Pu_c<??aVJ
zg&95F@^YEF6>66;%clG=)am&>wOXvcRv+Q;5Dfm2bZV?Rla-l?L_8#}9iWJqIqX<V
zyDekMEH6K%nERCMu|x8cY*MPu=Oq^(Z0k|)@AlVM>o$0ZA+M%RS1AsN47yQ!dnqnP
z>+@$5u9C~|uzxJ_0?$Ln{&!JU3pU5|Bn%0!{c6sBY#v3-UcU^LRtni9W9>Igf+&GN
z(>(e7@>w1{#E^&Y1x1EJ_h6PQay&-H<E6IedWgdqXpE(6BCT-Td*J&hJ5y?R839-e
zm}A*==sND^>vi?Q;_YTko^VGhy?A(cZgiF>XU(arH-7_4Na7$2+ddY~oL{`t5Tu0X
z5C4As!P@4CKtdlmRwvRULeUSjLzwBEanwZzyIX03Fagd<gS@u0l{U;S;5Xn^``I=a
zAv-O3R3#YPrRtf#TLO59AulM?(q8)y6s~b|lH2TNN~r<iF7m#e(7%0(^3kzD<IQt*
zT$!?4Us^sW1B7#X9VgPUdaxN!@v!Yxy<;KUajR;knCj!0oV#`_==0(^PbsoLG=u5&
v9k|%l<IDZe?k!MNlT;+=XXE7V{S#mSiNXfR;&KhU00000NkvXXu0mjfTZAfI

delta 631
zcmV--0*L+j1dj!fBYy%`Nkl<Zc-n1JZAg=06uqo>)|#aWYC;$oK`Q--5fUg9gIH)r
zu_$yReoP_M5K0P{KZeWM+(dIuH{00e>{aJy(wm5-V=1d><##CsS`mU#QT-6)^khjC
zUAXXEIOo7Q=OOxgL=<+ZV3)!)A6H;SY_8=SC(}EL4j!WaPJeirJg&qQtRHv**Ta`+
z7!0CCm_~<h2^z=vcd5c;WT@?b2zyFXk~LkQgy~hNn?|uS+YYhP20Cd$WU&iICd5Bl
zM%4Kx7ejMDDcfT5Z8P_#RuO--7bG)7s%nRMa0a0&4@lkuI(7?{?f@+J7a)q)<`G4d
z7wWp6p~5~1N`JP3%k&_ocmQ_;D~M9}Z{DJG2T0M1JN{*ysqXO+C#zX>KUhR;Ss%EJ
z4oH+e*k3w~KL1-ps|D;(dfD=zR2zycK2$r$K9fY*4Eyjbq**+q7y1#FCE!5mI40*l
zBCToyTzdbe5S?&Bt{sBT;|Gb;>ed}2jHJ2^ab`QhvwsCd=lM|Ev5erWuh6>Y5t`)%
zB{e`%GYFmAw?PzJ$u|qLNY%0sj?``@Cdy<Ujytfggok@{7Olb*^IHdfZx9z7g*QYY
zIf*G%-u3Q@*No7}6b+1E0;L&QYV0kqM_7&(hc(^kefk~|=ghWWJtb5(T<4#|Il6$|
z3_!A*pm3vGYe0Mj4`J#9<eKg^k`^cYZuhi=Wctn$n;+iCE6{g7fyyMH$UMTjnL}sb
z9g?nftx@FVQ~!P>j`>sX&2RJN8iu}HX&XbiWn|;*je#XeMpFxg6eex~e*pESNt4e7
Rxd{LO002ovPDHLkV1k7XATIy_

diff --git a/plugins/tasks/tasks-core/src/icons/clock@2x.png b/plugins/tasks/tasks-core/src/icons/clock@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2e69d55385e2eee40318cf248a8e77af7bb6099
GIT binary patch
literal 1462
zcmV;n1xfmeP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%SV=@dRCwB)R$XiqRTRE6cV>TPf7y21
zU0T@Eg#raE5B{P2SV=&|h~k^RnTS5Bk19_Z<D2@RF%sj8#up)w2my>jLlp=iP|_l$
zwB42d?9%=1?9R^4%$@O^{h@2wtqIe7y=U(^=R5bFd+)iIJ2hP*D}CRdzSIZJtAKrg
zen4AIl?L1boCBNy+*yf-!$3cN_|`*;!p^t%K=TP;SG|wtdEyX-imd7eF-^14<s#sS
zd-&*36D}fH4|h7C`4Vs#2jY_)q$d<0oqjiQ@|Iz!McuLpFG?<<#5kJF6-X?ZCHZ0r
z2Xr3%zk~KY2&gvl3YKLx1_?m(D`1DiCX#{PFj?)B$}X2H2{XxM=VHR>xnH`_cKg29
zXV-SEGdlbpe{ay+IiFYTBUAHSNz>l}^<%*GG6c&!$cD8PM1tlt1_^j1GB^-rZDt`k
zckPc9HT4X~bGkpgR&9^0ml6Ke5f%GThc*GQ9o!ye0WZ>!9mrMVtOZ({&{u$`f<717
zwY67UWv7#-T3GZ3yGo219NKX_wYKejEr~!G`<P*HXoI$X8=c&}C92^-k*mf@U}l6n
zF{zO6&s@fZKM(2Rp5MNn`D}DTa=VMoc26#G&mq_xraKVSn(38-?8%kQ==qVmRMm8x
z#vpDG-mK2(Q(XA1Jz>JK$%S<M4#oav82$ZZX!7b%pp`xypWw_~GPMo3kh8{3_#e(*
z9)NbI7j{?3C#mVlQC3e?GsvlgGcy}=wbG++W@^mn1TL@S#27natp@N=9Kv7S9jk~_
zlJ0MKc7Mh+8D|o!>A}-fML@Dv`u263iXG7{1%nsOH68vnW3fs>I3&~$WV_cx1cBx$
zFEUE1X;}X0C54uYvdD3qSXLA&IwiK;MwC28MKH~LyU(+Rka_&In}>g!@Wk6Wrsrp4
zlo_mL+D3mn7P3r}Ga2J5a;x+K2XOIr!gR`G2(l4p)MgVX(Tj_0;==K+K%`IJ_}nYW
zW@)*1<Ij$|9KSXcN{rtKzz$@B-N8h=lL-zdvq^4U$)+4-IVW~M{eoo^BvR6}Hooo%
zRg1%HSyj0ykZ`F=a@FD2)~cRqs{x#7TPi_Vg*AhPd8bF{+k0r%7mlcA^K~ZuFTEKb
zJM~ipDgx<$@r`)6|A~AvI}0{bem?FnY@Ur;I##Ll80a=s;c(faG!W`xFjA|r{xyD~
z&5!2+Hy;qTu!9m}xkC{%naNXDt?=V~t-O;|UdGbzE5puG3$oDaK>i=l7dgs0^QH2I
z2UiFNI*!tOI!B61F*tqcY%m?a?J`$btCfJhz|nzRbE#}S&@ukto+n2@7%nI(Sy(JN
zy^+n7<EyvFqX2!qk$#$5R2|5P+<=jKt@{{Les?B8h(8>3clWVJO`WTIgJt<b?GrQe
z^-XxBb{|=!cKsgJG@aa<o}mh}dP|Dzxj%l*n;5&|D;M(u+BN$_9onER`jkx4Gd6XP
zA{TN3_l4#6(ffcaIk`wi#$z^FWl>^tdy5NmPL8YIJy;Q@hfa1PP_Cp3bZCRNa+yVM
zg70EcLB1<B&i~%95E-=x&_Grca(#S?W_eeqe_*iPptb<BEKyGU<H*n4^&n8jKGdO2
zmUnkvzdcPGf*h!ER(Je2BQm-8`QgTQ1J?F0>W>r2X(yq;D&qILiJiA}Rw@`UIG#G(
zf@X0vw^$&FOqM96a(zwkaq>Z9kfyI7Fu=P0E+~J7_A?-OW@;8T$!z7hC5i$S@jlay
zh2_t!zW^WA*W{ry{58yIrSHt})lJYG1ndWFUiN_e8*mnI5-ZF~JpT$X0O96d7nIIN
QzyJUM07*qoM6N<$f=yw*ivR!s

literal 0
HcmV?d00001