# Conflicts:
#	plugins/terminal/src/org/jetbrains/plugins/terminal/JBTabInnerTerminalWidget.java

Update resolve so import sources don't resolve to inline package if stub package is not partial (PY-30942)

Update processing `__init__.pyi` in QualifiedNameFinder.PathChoosingVisitor so it provides correct names (PY-30942)

support <documentation> tag

Experimental registry key is use.tty.for.external.tools=false

Move syntax errors from inspections to annotator, update tests. Add test for header hierarchy detection

Consider editorconfig partial override a more general form of strict override. Merge partial and strict line-marker providers

Refactor EditorConfig line marker providers, and override finders. Fix some bugs in inheritance detection

javafx: patch command line to ensure that javafx modules come to the module path, use --add-reads (IDEA-200092)