idea/community.git
5 years agoMerge remote-tracking branch 'origin/master'
Roman Shevchenko [Thu, 10 Dec 2015 19:24:45 +0000 (20:24 +0100)]
Merge remote-tracking branch 'origin/master'

5 years ago[platform] optimize setting watch roots
Tomas Lundell [Thu, 10 Dec 2015 19:22:06 +0000 (20:22 +0100)]
[platform] optimize setting watch roots

The file system operations in local file system and canonical path map can be slow when done in serial for a large number of roots. Run these in parallel on an executor.

On our benchmarks with about 8000 roots this saves ~700ms, or about 70%, when setting watch roots.

#331 (https://github.com/JetBrains/intellij-community/pull/331)

5 years agoCleanup (safe platform check; formatting)
Roman Shevchenko [Thu, 10 Dec 2015 19:17:39 +0000 (20:17 +0100)]
Cleanup (safe platform check; formatting)

5 years agodon't show error on method reference if functional expression is located inside inval...
Anna Kozlova [Thu, 10 Dec 2015 18:52:16 +0000 (19:52 +0100)]
don't show error on method reference if functional expression is located inside invalid context without target functional type

5 years agoshow run menu: make cache null friendly (IDEA-149102)
Anna Kozlova [Thu, 10 Dec 2015 18:04:59 +0000 (19:04 +0100)]
show run menu: make cache null friendly (IDEA-149102)

5 years agotype migration: unused fields removed
Dmitry Batkovich [Thu, 10 Dec 2015 17:49:15 +0000 (20:49 +0300)]
type migration: unused fields removed

5 years agoavoid gaps in selection rendering for fractional coordinates - use proper rounding
Dmitry Batrak [Thu, 10 Dec 2015 17:27:42 +0000 (20:27 +0300)]
avoid gaps in selection rendering for fractional coordinates - use proper rounding

5 years agoIDEA-72989 fix rendering of characters from Unicode supplementary planes
Dmitry Batrak [Thu, 10 Dec 2015 17:02:56 +0000 (20:02 +0300)]
IDEA-72989 fix rendering of characters from Unicode supplementary planes

5 years agotests: do not include ignored in rerun failed (IDEA-149067)
Anna Kozlova [Thu, 10 Dec 2015 17:03:13 +0000 (18:03 +0100)]
tests: do not include ignored in rerun failed (IDEA-149067)

5 years agowording (IDEA-149014)
Anna Kozlova [Thu, 10 Dec 2015 16:45:28 +0000 (17:45 +0100)]
wording (IDEA-149014)

5 years agopreparing to migrate to Java 8: explicitly set language level 1.6 for intellij-core...
nik [Thu, 10 Dec 2015 17:09:40 +0000 (20:09 +0300)]
preparing to migrate to Java 8: explicitly set language level 1.6 for intellij-core modules

5 years agoIDEA-149135 Start failed when using JDK6 as IDEA_JDK
Maxim.Mossienko [Thu, 10 Dec 2015 16:41:43 +0000 (17:41 +0100)]
IDEA-149135 Start failed when using JDK6 as IDEA_JDK

5 years agoIDEA-148164 Fix scrollbar repainting
Sergey Malenkov [Thu, 10 Dec 2015 16:00:08 +0000 (19:00 +0300)]
IDEA-148164 Fix scrollbar repainting

5 years agofix casting to primitives according to the spec (IDEA-131107; IDEA-148880)
Anna Kozlova [Thu, 10 Dec 2015 15:57:39 +0000 (16:57 +0100)]
fix casting to primitives according to the spec (IDEA-131107; IDEA-148880)

5 years agomethod references: show candidates if overload resolution failed (IDEA-148974)
Anna Kozlova [Thu, 10 Dec 2015 15:49:24 +0000 (16:49 +0100)]
method references: show candidates if overload resolution failed (IDEA-148974)

5 years agomethod reference: preserve all conflicts to have navigation target
Anna Kozlova [Thu, 10 Dec 2015 11:52:02 +0000 (12:52 +0100)]
method reference: preserve all conflicts to have navigation target

5 years agogradle: fix merging of library and module dependencies
Vladislav.Soroka [Thu, 10 Dec 2015 15:55:33 +0000 (18:55 +0300)]
gradle: fix merging of library and module dependencies

5 years agogradle: do not add additional source folders from 'idea' plugin to main and test...
Vladislav.Soroka [Thu, 10 Dec 2015 15:54:28 +0000 (18:54 +0300)]
gradle: do not add additional source folders from 'idea' plugin to main and test modules if it is already belong to some other custom source set

5 years ago[groovy] test substitutor is not computed within resolve
Daniil Ovchinnikov [Thu, 10 Dec 2015 15:34:47 +0000 (18:34 +0300)]
[groovy] test substitutor is not computed within resolve

5 years ago[groovy] use Computable instead of NotNullLazyValue in GroovyMethodResult.
Daniil Ovchinnikov [Thu, 10 Dec 2015 15:25:34 +0000 (18:25 +0300)]
[groovy] use Computable instead of NotNullLazyValue in GroovyMethodResult.

- NotNullCachedComputableWrapper: clean Computable after obtaining result value.

5 years ago[groovy] @NotNull and @Override
Daniil Ovchinnikov [Thu, 10 Dec 2015 14:00:01 +0000 (17:00 +0300)]
[groovy] @NotNull and @Override

5 years ago[groovy] rename _inferer_ to _computer_
Daniil Ovchinnikov [Thu, 10 Dec 2015 13:58:47 +0000 (16:58 +0300)]
[groovy] rename _inferer_ to _computer_

5 years agobuilt-in server: workaround for changed logic of generating wildcards in method signa...
Dmitry Jemerov [Thu, 10 Dec 2015 15:44:20 +0000 (16:44 +0100)]
built-in server: workaround for changed logic of generating wildcards in method signatures between Kotlin beta 3 and beta 4

5 years agorevert cleanup: Kotlin beta 4 no longer allows type parameters that have both a class...
Dmitry Jemerov [Thu, 10 Dec 2015 15:43:30 +0000 (16:43 +0100)]
revert cleanup: Kotlin beta 4 no longer allows type parameters that have both a class and another type parameter as bounds

5 years agocleanup of CleanupInspectionIntention
Dmitry Batkovich [Thu, 10 Dec 2015 15:37:49 +0000 (18:37 +0300)]
cleanup of CleanupInspectionIntention

5 years agoinspection settings: "New in {product_major_version}"
Dmitry Batkovich [Thu, 10 Dec 2015 15:36:17 +0000 (18:36 +0300)]
inspection settings: "New in {product_major_version}"

5 years agonew in 14 -> new in 15 appcode/144.2012 clion/144.2013
Dmitry Batkovich [Thu, 10 Dec 2015 14:57:09 +0000 (17:57 +0300)]
new in 14 -> new in 15

5 years agoIDEA-91878 Intention "Unused XML schema declaration" removes also used schema declatarion
Dmitry Avdeev [Thu, 10 Dec 2015 14:31:55 +0000 (17:31 +0300)]
IDEA-91878 Intention "Unused XML schema declaration" removes also used schema declatarion

5 years agodon't validate breakpoint on set — doesn't make any sense since sourcemaps
Vladimir Krivosheev [Thu, 10 Dec 2015 14:19:05 +0000 (15:19 +0100)]
don't validate breakpoint on set — doesn't make any sense since sourcemaps
meteor debug test works

5 years agoIndexError in pydev_monkey.py when debugging (PY-9767)
Elizaveta Shashkova [Thu, 10 Dec 2015 14:07:04 +0000 (17:07 +0300)]
IndexError in pydev_monkey.py when debugging (PY-9767)

 We shouldn't attach to debugger if there are only options in a new python process command line

5 years ago[groovy] make inferred substitutor lazy and do not compute it until returned from... idea/144.2011
Daniil Ovchinnikov [Tue, 8 Dec 2015 17:50:58 +0000 (20:50 +0300)]
[groovy] make inferred substitutor lazy and do not compute it until returned from resolve.

- check applicability by shape in MethodResolverProcessor.
- erase argument types if by shape but use non-erased types for inferring substitutor anyways.

5 years ago[groovy] fix filtering same signatures
Daniil Ovchinnikov [Tue, 8 Dec 2015 16:25:11 +0000 (19:25 +0300)]
[groovy] fix filtering same signatures

5 years ago[groovy] make SubstitutorComputer.obtainSubstitutor() accept resolveContext as PsiElement
Daniil Ovchinnikov [Sun, 6 Dec 2015 19:33:23 +0000 (22:33 +0300)]
[groovy] make SubstitutorComputer.obtainSubstitutor() accept resolveContext as PsiElement

5 years ago[groovy] do as less comparisons as possible when filtering methods in MethodResolverP...
Daniil Ovchinnikov [Thu, 3 Dec 2015 15:37:55 +0000 (18:37 +0300)]
[groovy] do as less comparisons as possible when filtering methods in MethodResolverProcessor

5 years ago[groovy] pass GroovyMethodResult instances instead of bunch of arguments.
Daniil Ovchinnikov [Thu, 3 Dec 2015 15:13:05 +0000 (18:13 +0300)]
[groovy] pass GroovyMethodResult instances instead of bunch of arguments.

5 years ago[groovy] introduce GroovyMethodResult extending GroovyResolveResultImpl.
Daniil Ovchinnikov [Thu, 3 Dec 2015 14:58:32 +0000 (17:58 +0300)]
[groovy] introduce GroovyMethodResult extending GroovyResolveResultImpl.

Also:
- Make ResolverProcessor generic.
- Move execute() logic from ResolverProcessor to its inheritor.
- NotNull/Nullable in GroovyResolveResultImpl

5 years agochanged hardcoded group
Alexey Kudravtsev [Thu, 10 Dec 2015 13:43:40 +0000 (16:43 +0300)]
changed hardcoded group

5 years agoIDEA-144668 Ability to disable "Run config" and "test indicator" gutters: run icon
Dmitry Avdeev [Thu, 10 Dec 2015 13:39:53 +0000 (16:39 +0300)]
IDEA-144668 Ability to disable "Run config" and "test indicator" gutters: run icon

5 years agoIDEA-CR-7349 pycharm/144.2010
Vladimir.Orlov [Thu, 10 Dec 2015 13:32:45 +0000 (16:32 +0300)]
IDEA-CR-7349

5 years agoMerge remote-tracking branch 'origin/master'
Vladimir.Orlov [Thu, 10 Dec 2015 13:32:26 +0000 (16:32 +0300)]
Merge remote-tracking branch 'origin/master'

5 years agoinlined BoundedTaskExecutorService
Alexey Kudravtsev [Thu, 10 Dec 2015 13:29:08 +0000 (16:29 +0300)]
inlined BoundedTaskExecutorService

5 years agoMerge remote-tracking branch 'origin/master'
Vladimir.Orlov [Thu, 10 Dec 2015 13:30:09 +0000 (16:30 +0300)]
Merge remote-tracking branch 'origin/master'

5 years agoEA-75142 - NPE: ToggleReadOnlyAttributePanel.selectionChanged
Dmitry Batrak [Thu, 10 Dec 2015 13:24:02 +0000 (16:24 +0300)]
EA-75142 - NPE: ToggleReadOnlyAttributePanel.selectionChanged

5 years agoMerge remote-tracking branch 'origin/master'
Vladimir.Orlov [Thu, 10 Dec 2015 13:25:24 +0000 (16:25 +0300)]
Merge remote-tracking branch 'origin/master'

5 years agoIDEA-144668 Ability to disable "Run config" and "test indicator" gutters: external...
Dmitry Avdeev [Thu, 10 Dec 2015 13:23:06 +0000 (16:23 +0300)]
IDEA-144668 Ability to disable "Run config" and "test indicator" gutters: external annotations icon

5 years agoupdated EDU script as part of preventing stop TC server-side checkout.
Vladimir.Orlov [Thu, 10 Dec 2015 13:18:57 +0000 (16:18 +0300)]
updated EDU script as part of preventing stop TC server-side checkout.

5 years agoIDEA-149002 Added filtering capability to svn branch selection popup
Konstantin Kolosovsky [Thu, 10 Dec 2015 13:14:16 +0000 (16:14 +0300)]
IDEA-149002 Added filtering capability to svn branch selection popup

5 years agofix HTML detection: use BasicHTML.isHTMLString()
Alexander Doroshko [Thu, 10 Dec 2015 13:14:58 +0000 (16:14 +0300)]
fix HTML detection: use BasicHTML.isHTMLString()

5 years agoIDEA-144668 Ability to disable "Run config" and "test indicator" gutters: UI tweaks
Dmitry Avdeev [Thu, 10 Dec 2015 13:10:50 +0000 (16:10 +0300)]
IDEA-144668 Ability to disable "Run config" and "test indicator" gutters: UI tweaks

5 years agowait for JDI thread to terminate instead of hardcoding to ignore it
Alexey Kudravtsev [Thu, 10 Dec 2015 12:56:57 +0000 (15:56 +0300)]
wait for JDI thread to terminate instead of hardcoding to ignore it

5 years agountangled editor-ui-api vs structure-view-api vs analysis-api modules mutual dependen...
Alexey Kudravtsev [Thu, 10 Dec 2015 12:54:40 +0000 (15:54 +0300)]
untangled editor-ui-api vs structure-view-api vs analysis-api modules mutual dependency (by moving all structure-view-api into editor-ui-api)

5 years agonotnull
Alexey Kudravtsev [Thu, 10 Dec 2015 12:53:07 +0000 (15:53 +0300)]
notnull

5 years agotighten access inspection
Alexey Kudravtsev [Thu, 10 Dec 2015 12:40:13 +0000 (15:40 +0300)]
tighten access inspection

5 years agogroupName replaced with groupKey
Alexey Kudravtsev [Thu, 10 Dec 2015 11:30:35 +0000 (14:30 +0300)]
groupName replaced with groupKey

5 years agoEA-76112 - NPE: ConfigurationContext.getProject
Dmitry Avdeev [Thu, 10 Dec 2015 12:33:57 +0000 (15:33 +0300)]
EA-76112 - NPE: ConfigurationContext.getProject

5 years agoicons.gant: added icon-robots.txt to skip icon classes generation for resource module...
nik [Thu, 10 Dec 2015 12:32:32 +0000 (15:32 +0300)]
icons.gant: added icon-robots.txt to skip icon classes generation for resource modules instead of using hard-coded blacklist

5 years agoicons size optimized
nik [Thu, 10 Dec 2015 12:29:12 +0000 (15:29 +0300)]
icons size optimized

5 years agoadded icon-robots.txt to skip icon class generation for tips/images
nik [Thu, 10 Dec 2015 12:29:05 +0000 (15:29 +0300)]
added icon-robots.txt to skip icon class generation for tips/images

5 years agotype migration: migration type information moved from TypeMigrationRules to correspon... phpstorm/144.2009
Dmitry Batkovich [Thu, 10 Dec 2015 12:14:49 +0000 (15:14 +0300)]
type migration: migration type information moved from TypeMigrationRules to corresponding Labeler and RefactoringProcessor

5 years agoIDEA-144668 Ability to disable "Run config" and "test indicator" gutters: group by... appcode/144.2008 clion/144.2007
Dmitry Avdeev [Thu, 10 Dec 2015 11:23:53 +0000 (14:23 +0300)]
IDEA-144668 Ability to disable "Run config" and "test indicator" gutters: group by plugin

5 years agoIDEA-148739 [follow-up]
Anton Tarasov [Thu, 10 Dec 2015 11:08:31 +0000 (14:08 +0300)]
IDEA-148739 [follow-up]

1. Refactor the cache code. Add 1x images to the cache.
2. Clear the cache on state change.
3. Mind concurrency where applicable.

5 years agodo not allow drag for renderers that do not support it
Egor.Ushakov [Thu, 10 Dec 2015 11:29:30 +0000 (14:29 +0300)]
do not allow drag for renderers that do not support it

5 years agoyet another attempt to fix blinking test
Dmitry Batrak [Thu, 10 Dec 2015 11:25:58 +0000 (14:25 +0300)]
yet another attempt to fix blinking test

5 years agotype migration: TypeMigrationLabeler inline 1-line 1-usage method
Dmitry Batkovich [Thu, 10 Dec 2015 11:07:39 +0000 (14:07 +0300)]
type migration: TypeMigrationLabeler inline 1-line 1-usage method

5 years agoPerformance fix: IDEA-148903 xml file long processing
Rustam Vishnyakov [Thu, 10 Dec 2015 10:35:05 +0000 (13:35 +0300)]
Performance fix: IDEA-148903 xml file long processing

5 years agomove RequestPromise class to top-level
Vladimir Krivosheev [Thu, 10 Dec 2015 10:43:06 +0000 (11:43 +0100)]
move RequestPromise class to top-level

5 years agoCleanup (duplication)
Roman Shevchenko [Thu, 10 Dec 2015 10:38:56 +0000 (11:38 +0100)]
Cleanup (duplication)

5 years agoIDEA-148519 Find in Path Directory dropdown makes it impossible to distinguish betwee...
Maxim.Mossienko [Thu, 10 Dec 2015 10:35:13 +0000 (11:35 +0100)]
IDEA-148519 Find in Path Directory dropdown makes it impossible to distinguish between long paths

5 years agoguava type migration: migrate FluentIterable/Optional chain method qualifier
Dmitry Batkovich [Thu, 10 Dec 2015 10:27:58 +0000 (13:27 +0300)]
guava type migration: migrate FluentIterable/Optional chain method qualifier

5 years agosdk_closed icons optimized
nik [Thu, 10 Dec 2015 10:29:21 +0000 (13:29 +0300)]
sdk_closed icons optimized

5 years agoAllIcons regenerated
nik [Thu, 10 Dec 2015 10:28:53 +0000 (13:28 +0300)]
AllIcons regenerated

5 years agoit is possible now to use runInEdtAndWait directly in kotlin, JVM object static metho...
Vladimir Krivosheev [Thu, 10 Dec 2015 10:09:08 +0000 (11:09 +0100)]
it is possible now to use runInEdtAndWait directly in kotlin, JVM object static method now delegates to kotin package fun

5 years agoIDEA-144668 Ability to disable "Run config" and "test indicator" gutters: options...
Dmitry Avdeev [Wed, 9 Dec 2015 16:47:17 +0000 (19:47 +0300)]
IDEA-144668 Ability to disable "Run config" and "test indicator" gutters: options in work

5 years agoProcessUtils moved to platform-api - it's not public API-ready (pt2)
Anton Makeev [Thu, 10 Dec 2015 09:09:57 +0000 (10:09 +0100)]
ProcessUtils moved to platform-api - it's not public API-ready (pt2)

5 years agoProcessUtils moved to platform-api - it's not public API-ready
Anton Makeev [Thu, 10 Dec 2015 09:06:51 +0000 (10:06 +0100)]
ProcessUtils moved to platform-api - it's not public API-ready

5 years agoupdate broken plugins appcode/144.2005 clion/144.2004
Dennis Ushakov [Thu, 10 Dec 2015 08:44:43 +0000 (11:44 +0300)]
update broken plugins

5 years agoMeteorDebugTest — finally failed
Vladimir Krivosheev [Wed, 9 Dec 2015 17:20:15 +0000 (18:20 +0100)]
MeteorDebugTest — finally failed

5 years agoMerge remote-tracking branch 'origin/master' appcode/144.1993 clion/144.1989 clion/144.1991 dbe/144.1990 idea/144.1992 phpstorm/144.1986 phpstorm/144.1996 pycharm/144.1997 pycharm/144.2000 pycharm/144.2001 rubymine/144.1998 webstorm/144.1999
Andrey Vlasovskikh [Wed, 9 Dec 2015 21:29:19 +0000 (00:29 +0300)]
Merge remote-tracking branch 'origin/master'

5 years agoIn case of several metaclasses find the most derived one according to the language...
Andrey Vlasovskikh [Wed, 9 Dec 2015 21:24:28 +0000 (00:24 +0300)]
In case of several metaclasses find the most derived one according to the language spec (PY-17841)

This bug leaded to a regression in `typing.List[]` since we had not
resolved qualified references in stub modules and had not known about
the first metaclass of `List` that was `ABCMeta`, not the most derived
`GenericMeta`.

5 years agolambda: missed ground type for target functional type (IDEA-149053) clion/144.1985
Anna Kozlova [Wed, 9 Dec 2015 20:16:45 +0000 (21:16 +0100)]
lambda: missed ground type for target functional type (IDEA-149053)

5 years agomake variable type A<? super B&C> denotable (IDEA-57518; IDEA-57273)
Anna Kozlova [Wed, 9 Dec 2015 19:33:15 +0000 (20:33 +0100)]
make variable type A<? super B&C> denotable (IDEA-57518; IDEA-57273)

5 years agotype migration tests fixed
Dmitry Batkovich [Wed, 9 Dec 2015 19:49:42 +0000 (22:49 +0300)]
type migration tests fixed

5 years agoMerge remote-tracking branch 'origin/master'
Yann Cébron [Wed, 9 Dec 2015 19:07:48 +0000 (20:07 +0100)]
Merge remote-tracking branch 'origin/master'

5 years agoIDEA-149092 Navigate to Action class from plugin.xml can cross module boundaries
Yann Cébron [Wed, 9 Dec 2015 19:06:40 +0000 (20:06 +0100)]
IDEA-149092 Navigate to Action class from plugin.xml can cross module boundaries

5 years agopotentially compatible for ll < 1.8
Anna Kozlova [Wed, 9 Dec 2015 19:05:59 +0000 (20:05 +0100)]
potentially compatible for ll < 1.8

5 years agoensure potential compatible for pertinent to applicability: when number of parameters...
Anna Kozlova [Wed, 9 Dec 2015 18:28:03 +0000 (19:28 +0100)]
ensure potential compatible for pertinent to applicability: when number of parameters is wrong methods which are not potentially compatible are not filtered (IDEA-149103)

5 years agoassignment: stop bounds promotion inside nested wildcards (IDEA-139161)
Anna Kozlova [Wed, 9 Dec 2015 17:21:29 +0000 (18:21 +0100)]
assignment: stop bounds promotion inside nested wildcards (IDEA-139161)

5 years agotestdata for IDEA-130243
Anna Kozlova [Wed, 9 Dec 2015 11:48:46 +0000 (12:48 +0100)]
testdata for IDEA-130243

5 years agotestdata for IDEA-139096
Anna Kozlova [Wed, 9 Dec 2015 11:41:01 +0000 (12:41 +0100)]
testdata for IDEA-139096

5 years agoAdd check if error not in ignoredError list
Valentina Kiryushkina [Fri, 4 Dec 2015 16:38:32 +0000 (19:38 +0300)]
Add check if error not in ignoredError list

It was possible to add an error code more than one time if we don't change caret position after adding ignored error for the first time

5 years agoIgnore PEP-8 naming conventions by error code
Valentina Kiryushkina [Fri, 4 Dec 2015 16:33:55 +0000 (19:33 +0300)]
Ignore PEP-8 naming conventions by error code

5 years agoSpecify pattern in string reference provider
Valentina Kiryushkina [Wed, 9 Dec 2015 12:01:55 +0000 (15:01 +0300)]
Specify pattern in string reference provider

5 years agoDo not resolve substitution chunk reference to dict and reference expression
Valentina Kiryushkina [Mon, 7 Dec 2015 09:46:27 +0000 (12:46 +0300)]
Do not resolve substitution chunk reference to dict and reference expression

Resolving such references leads to errors or undesirable behaviour if user's trying to rename element

5 years agoMinor Resolve only to string dict keys
Valentina Kiryushkina [Wed, 2 Dec 2015 17:31:14 +0000 (20:31 +0300)]
Minor Resolve only to string dict keys

5 years agoMinor Fix variables names
Valentina Kiryushkina [Wed, 2 Dec 2015 11:43:06 +0000 (14:43 +0300)]
Minor Fix variables names

5 years agoDo not resolve to reference expression in format argument. Resolve to dict key if...
Valentina Kiryushkina [Wed, 2 Dec 2015 11:06:03 +0000 (14:06 +0300)]
Do not resolve to reference expression in format argument. Resolve to dict key if format argument is dict literal expression

5 years agoPY-1779 Add autoclosing for triple quotes
Valentina Kiryushkina [Tue, 1 Dec 2015 12:28:53 +0000 (15:28 +0300)]
PY-1779 Add autoclosing for triple quotes

5 years agoCleanup
Valentina Kiryushkina [Tue, 1 Dec 2015 08:14:06 +0000 (11:14 +0300)]
Cleanup

5 years agoUse keyword text range as refrerence text range in order to use supreclass handleElem...
Valentina Kiryushkina [Fri, 27 Nov 2015 08:18:24 +0000 (11:18 +0300)]
Use keyword text range as refrerence text range in order to use supreclass handleElementRename. Resolve to  ReferenceExpression in star argument of format function

5 years agoAdd resolve and rename tests
Valentina Kiryushkina [Fri, 27 Nov 2015 08:07:39 +0000 (11:07 +0300)]
Add resolve and rename tests