diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-09-11 15:53:32 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-09-11 15:53:37 -0700 |
| commit | a28de544d7f6bae0c637a1f8175ea613a976c52e (patch) | |
| tree | 0b506efac9439f5a06d00e4aef4597c6d49bba3c /xml | |
| parent | c7f983b5dcd0499fc68aacaba043874648932b6b (diff) | |
| download | idea-a28de544d7f6bae0c637a1f8175ea613a976c52e.tar.gz | |
Snapshot b7cfcd5072e521a95c49cdd58405fa262075116e from idea/132.197 of git://git.jetbrains.org/idea/community.git
b7cfcd5: 2013-09-10 Alexey Kudravtsev - cleanup
98e9b07: 2013-09-10 Alexey Kudravtsev - optimisation: almost always one element set/map
06b1744: 2013-09-10 Alexey Kudravtsev - cleanup static final constants
c2f6153: 2013-09-10 Alexey Kudravtsev - cleanup
df9d3ff: 2013-09-10 Alexey Kudravtsev - IDEA-113331
c502feb: 2013-09-10 Alexey Kudravtsev - cleanup
4790327: 2013-09-09 Alexey Kudravtsev - cleanup
734f361: 2013-09-09 Alexey Kudravtsev - cleanup
4fa0b86: 2013-09-11 Dmitry Avdeev - action moved from platform to IDEA
cade1ac: 2013-09-11 Bas Leijdekkers - don't make quickfix available when it does nothing
e25c86f: 2013-09-11 nik - fixed copying items from 'Dependencies' panel (IDEA-108071)
ba416aa: 2013-09-11 nik - IDEA-108213: ZipException on attempt to extract non-existent jar when building artifact
e55712a: 2013-09-11 nik - show path to incorrect zip-file in error message (IDEA-113123), improved
68d131a: 2013-09-11 Vladislav.Soroka - Gradle: gradle build file can be used to resolve project info instead of gradle project dir
09cdde1: 2013-09-11 nik - JPS bootstrap build libs updated
6e4c9f0: 2013-09-10 nik - xdebugger: mark new properties appeared after step in debugger trees (WI-3066)
7aa6d26: 2013-09-10 nik - jps model: added method to process annotation roots from module and its dependencies
de4cbc7: 2013-09-10 nik - IDEA-112009: Library selection dialog is too small
ba3c923: 2013-09-10 Bas Leijdekkers - IDEA-93530 (bad code green: cannot assign a value to final variable)
ae1a4ca: 2013-09-11 Vassiliy Kudryashov - Lense mode "internal" preview
296e85f: 2013-09-10 Dmitry Jemerov - Merge branch 'master' of git://github.com/asedunov/intellij-community into pull97
816cc8a: 2013-09-10 Bas Leijdekkers - IDEA-93515 (Good code red: variable might not have been initialized)
f3a5bef: 2013-09-10 Gregory.Shrago - IDEA-113281 Ctrl+E for Console History shadows hotkey for Recent
00c7cc6: 2013-09-10 Anna Kozlova - EA-49751 - NPE: TestsOutputConsolePrinter.isRoot
c848db6: 2013-09-10 Anna Kozlova - Poly Expressions
9f5e9d5: 2013-09-10 Vladimir Krivosheev - correct fix WEB-8151
8534bf1: 2013-09-10 peter - cache the default dfaVar type
2ee4c95: 2013-09-10 peter - merge DfaNotNullValue into DfaTypeValue
650794d: 2013-09-10 peter - some findusageability in dfa
a75c57d: 2013-09-10 Alexey Sedunov - Refactor method search classes for better reusability
049514a: 2013-09-10 Vladislav.Soroka - IDEA-50450 Gradle code insight; tasks dsl resolving (incomplete)
8bb28e2: 2013-09-10 Denis Fokin - Cocoa does not like activities while transition in full screen is happening. This fix prevents simultaneous entering in the full screen mode.
c837b30: 2013-09-10 Sergey Evdokimov - IDEA-109771 Incorrent Maven dependency resolution with war classes dependency
eede608: 2013-09-10 Dmitry Avdeev - no icons in wizards
a18ab7c: 2013-09-10 Dmitry Avdeev - cleanup
204e83b: 2013-09-10 Dmitry Avdeev - cleanup
33d61c5: 2013-09-10 Dmitry Avdeev - fixed layout in absence of icons
70a172a: 2013-09-10 Bas Leijdekkers - IDEA-91960 (Type parameter extends final class inspection warns on cases when can not be removed)
f0e77a8: 2013-09-10 Rustam Vishnyakov - Allow to move a standard code style option to another group [CR-IC-2192] (cherry picked from commit 81c4f16)
3748154: 2013-09-10 Max Medvedev - IDEA-113299 Imports removed when writing javadoc
1a6ca29: 2013-09-10 Max Medvedev - IDEA-52424 language injection for GStrings and binary expressions
83237e6: 2013-07-07 Max Medvedev - IDEA-99638 completion in @Language("<caret>")
075e763: 2013-09-10 Aleksey Pivovarov - @NotNull
836e1af: 2013-09-10 Aleksey Pivovarov - Github: Ref -> AtomicReference
2c384d0: 2013-09-10 Aleksey Pivovarov - Github: remove duplication
1d09e47: 2013-09-10 Aleksey Pivovarov - Github: fetch a single branch for diff
3361c53: 2013-09-10 Aleksey Pivovarov - Github: use BorderFactory
0c1a982: 2013-09-10 Aleksey Pivovarov - Github: Nullable
403902b: 2013-09-07 Aleksey Pivovarov - Github: project-level settings
911bea9: 2013-09-10 Vladislav.Soroka - IDEA-113403 Gradle: disable wrapper verification by default and add check for default wrapper files
7434b38: 2013-09-10 Dmitry Avdeev - preferred focused component for wizards
ecf3594: 2013-09-10 peter - static CachedValueManager.getCachedValue(PsiElement, CachedValueProvider) for less verbose cached value storage in psi user data
7d3f4f25: 2013-09-10 peter - some dfa simplifications not affecting tests
9d04224: 2013-09-09 peter - remove unused DelegatingInstructionVisitor
dff5e27: 2013-09-10 Denis Fokin - Windows long paths issue has been fixed, the com.intellij.ui.win.Task was moved from RecentTasks class because of some problems with JNI invocations. Class path now is enclosed by double quotes.
a1e5a9d: 2013-09-10 Ekaterina Tuzova - Merge remote-tracking branch 'origin/master'
dcb78a4: 2013-09-10 Ekaterina Tuzova - Merge remote-tracking branch 'origin/master'
7840bbe: 2013-09-10 Anna Kozlova - deprecate to be able to be used in PsiClass etc
401e730: 2013-09-10 Ekaterina Tuzova - Merge remote-tracking branch 'origin/master'
2fb38cf: 2013-09-10 Anna Kozlova - Merge remote-tracking branch 'origin/master'
6bae9e1: 2013-09-10 Anna Kozlova - optimization
a5ebbff: 2013-09-10 Anna Kozlova - cleanup lambda specifics
a44e101: 2013-09-10 Anna Kozlova - EA-49734 - IAE: GenericsHighlightUtil.checkReferenceTypeArgumentList
73bc4cb: 2013-09-10 Vladimir Krivosheev - auth works now, continue "sync now" button
f590909: 2013-09-10 Dmitry Jemerov - Merge branch 'master' of git://github.com/bashor/intellij-community into pull96
769fd94: 2013-09-10 Ekaterina Tuzova - fixed PY-10714 Reformat of string creates error
da07f0e: 2013-09-10 Konstantin Kolosovsky - Merge branch 'svn1_8_new'
08f3baf: 2013-09-10 Konstantin Kolosovsky - IDEA-112179 PropertiesComponent refactored - duplication removed
cdfb7ae: 2013-09-10 Konstantin Kolosovsky - IDEA-112179 Add/Edit/Delete svn properties
0a36021: 2013-09-10 nik - IDEA-112941: Throwable at com.intellij.openapi.roots.ui.configuration.classpath.ChangeLibraryLevelActionBase$1.run
da397a1: 2013-09-10 peter - add a note on adverse groovy-hotswap effects on serialization (IDEA-61884)
adf5bb7: 2013-09-10 nik - fixed building CE by 64-bit JDK (IDEA-112953)
1b396ef: 2013-09-10 nik - jps build: memory usage optimization
921a2f3: 2013-09-10 Konstantin Bulenkov - mem leak fixed
276c402: 2013-09-10 Dmitry Avdeev - new project wizard
b07de54: 2013-09-10 nik - show path to incorrect zip-file in error message (IDEA-113123)
ab4e6c6: 2013-09-10 nik - remote servers: allow to show additional logs for deployments in 'Servers View' - 2
eb65d57: 2013-09-09 nik - remote servers: allow to show additional logs for deployments in 'Servers View'
faff6c2: 2013-07-07 Max Medvedev - duplicated test
fe0569b: 2013-07-07 Max Medvedev - fix broken jar in test-data
a840eb2: 2013-07-07 Max Medvedev - Groovy shell: support commands
bb2ff42: 2013-07-07 Max Medvedev - Groovy Shell: support classes
a7658c1: 2013-07-07 Max Medvedev - Complete imported classes in GroovyCodeFragment
e53f7be: 2013-07-07 Max Medvedev - NN/Nu
edd7e1e: 2013-07-07 Max Medvedev - support imports in GroovyShell
f203ff2: 2013-07-07 Max Medvedev - support imports in GroovyShell
d45e9cd: 2013-07-07 Max Medvedev - Groovy element factory: create import from statement
59f6256: 2013-07-07 Max Medvedev - IDEA-110179 fix control flow building for if-statement
c9f45b6: 2013-07-07 Max Medvedev - fix GroovyIntentionsBundle
02bf9a6: 2013-07-07 Max Medvedev - IDEA-110178 'convert concatenation to GString' intention supports regexes
8f4f1ac: 2013-07-06 Max Medvedev - fix GroovyEnterHandler
f5bb52d: 2013-07-06 Max Medvedev - IDEA-110178 upper letters
711f61e: 2013-07-06 Max Medvedev - IDEA-110178 'convert string literal to dollar-slashy string' intention
9462203: 2013-07-06 Max Medvedev - IDEA-110178 'convert string literal to regex' intention should convert dollar-slashy regexes
c53a519: 2013-07-06 Max Medvedev - cleanup GrStringUtil
7134b63: 2013-07-06 Max Medvedev - IDEA-110178 'convert string literal to regex' intention
60b2f0a: 2013-07-06 Max Medvedev - IDEA-109053 Convert to single-line string fixed
1dea12c: 2013-09-10 Vladimir Krivosheev - fix fetch initial "sync now" button
3cc0794: 2013-09-09 Vladimir Krivosheev - add note about SkipDefaultValuesSerializationFilters
67ecfc0: 2013-09-09 Vladimir Krivosheev - ApplicationImpl — cleanup getExtensions ics — commit under progress
4cae157: 2013-09-09 Anna Kozlova - more specific: lambda extended initial fix (IDEA-113357)
0195034: 2013-09-09 Anna Kozlova - lambda -> method ref: reject unresolved lambdas
f1b399b: 2013-09-09 Alexander Lobas - RenderServer
4252a50: 2013-09-09 Vladimir Krivosheev - SingleAlarm — should use ModalityState.NON_MODAL
a5ca071: 2013-09-09 Konstantin Kolosovsky - IDEA-112179 "Set property" action implemented
2fa6ff6: 2013-09-09 Bas Leijdekkers - test for IDEA-53184
b57f5e1: 2013-09-09 Konstantin Bulenkov - WI-19949 Parent class methods aren't shown after second Command-F12
a2beba8: 2013-09-09 Zalim Bashorov - When we don't have any dependency(after f4a27e8) we should use ModificationTracker.NEVER_CHANGED instead empty array.
5154748: 2013-09-09 Konstantin Kolosovsky - IDEA-112181 Handling readonly files with or without "svn:needs-lock" property
55a5f4c: 2013-09-09 Dmitry Trofimov - Merge remote-tracking branch 'origin/master'
e6f6c94: 2013-09-09 Vladimir Krivosheev - WEB-6780 JS Debugger / Variables: "Jump to Source" not working: This action should be available only for object or functions.
cd02963: 2013-09-09 Konstantin Kolosovsky - IDEA-112181 Lock data parsing for "svn info" command
66b72f8: 2013-09-09 Bas Leijdekkers - fix test and add test for IOE
bb9b1f5: 2013-09-09 peter - IDEA-113391 Edit Method Contract intention for library methods
b77731d: 2013-09-09 Konstantin Kolosovsky - IDEA-112181 Lock/Unlock actions implemented
bc8cb84: 2013-09-09 Konstantin Kolosovsky - IDEA-94942 Utility methods to parse svn command line warnings
b45114d: 2013-09-09 Dmitry Trofimov - Possibility to select Maya.app on Mac in add interpreter dialog.
631b361: 2013-09-09 Sergey Evdokimov - Completion of dependency should honor <dependencyManagement> section
0fcbc91: 2013-09-09 Roman Shevchenko - platform: correct formatting in the missing framework library validator
660731f: 2013-09-09 Bas Leijdekkers - use TypeConversionUtil.erasure() instead of reinventing the wheel badly
0fcec29: 2013-09-09 Bas Leijdekkers - prevent IOE on array initializer without array type (e.g. Map<String, String> m = {})
5d70c64: 2013-09-09 Fedor Korotkov - Reverted 482c517
ea4b4f2: 2013-09-09 Vladimir Krivosheev - continue WEB-1171 javascript live console: execution enabled condition
54872b0: 2013-09-09 Anna Kozlova - accept interfaces as main classes for java 8 (IDEA-113340)
c9fc494: 2013-09-09 Anna Kozlova - pull up: ensure that default won't be inserted for ll < 1.8 (IDEA-113323)
c51363b: 2013-09-09 Vladimir Krivosheev - we should not call execute action if completion variant not focused
7c5f486: 2013-09-09 Dmitry Trofimov - Disposable parent can be null.
1e9a0d8: 2013-09-09 nik - xdebugger: simplified calling old deprecated method & javadocs added
2e3c259: 2013-09-09 nik - notnullification
0aa3d9d: 2013-09-09 Vladimir Krivosheev - continue WEB-1171 javascript live console: add history actions
ac12238: 2013-09-09 Vladimir Krivosheev - add Copyright
c7d7080: 2013-09-08 Alex Ruiz - Minor changes to NewProjectCheckoutListener to reuse its code.
8d29e4f: 2013-09-09 Sergey Simonchik - XDebugProcess method rename: createLayouter -> createTabLayouter
f58251b: 2013-09-09 Sergey Simonchik - XDebugProcess.registerAdditionalContent method restored to keep compatibility with IDEA 12 API
286cdc3: 2013-09-09 Anna Kozlova - anonym -> lambda: unique param names (IDEA-113338)
238e311: 2013-09-09 Vladimir Krivosheev - prefer to use interface LanguageConsoleView instead of impl class
d75838a: 2013-09-06 Vladimir Krivosheev - continue WEB-1171 javascript live console — works now, but UI is ugly
9f054b0: 2013-09-09 Sergey Simonchik - XDebug layout API improvement: XDebugProcess.registerAdditionalContent moved to XDebugLayouter
7cc0d20: 2013-09-08 Vladimir Krivosheev - schedule commit&push
4d9e998: 2013-09-08 Vladimir Krivosheev - move SingleAlarm to platform-impl
4d840cf: 2013-09-08 Dmitry Trofimov - Merge remote-tracking branch 'origin/master'
134a7fa: 2013-09-08 Fedor Korotkov - WEB-8731 HTML parser breaks with unquoted complex attributes
482c517: 2013-09-08 Fedor Korotkov - WEB-8397 Incorrect "element is not allowed here" inspection
3bbc3f7: 2013-09-08 Dmitry Trofimov - Implement get variable for console variables view.
12e32a8: 2013-09-08 Bas Leijdekkers - IDEA-96419 ("Externalizable class without public no-arg constructor" inspection options)
2d25b3b: 2013-09-08 Bas Leijdekkers - DRY
8941cf8: 2013-09-08 Bas Leijdekkers - IDEA-113298 (replace assertTrue with assertFalse removes message)
72c972f: 2013-09-07 Max Medvedev - auto inject RegExp lang to reg-exp operator argeuments
e7fa284: 2013-09-07 Max Medvedev - IDEA-113346 False negative in groovy withStream closure
0b795be: 2013-09-07 Bas Leijdekkers - IDEA-85224 (Inspection "non thread-safe static field access" gives false +ve for static initializers)
28a1e72: 2013-09-07 Bas Leijdekkers - cleanup
8bc5fbf: 2013-06-12 Max Medvedev - IDEA-111780 Extract method from static closure should create static method
bc4b2d7: 2013-06-12 Max Medvedev - IDEA-112878 Groovy code completion doesn't obey 'before parentheses -> method parentheses' settings.
1afc036: 2013-09-07 Dmitry Trofimov - Merge remote-tracking branch 'origin/master'
80cd221: 2013-09-07 Aleksey Pivovarov - Github: simplify
80a15fc: 2013-09-07 Aleksey Pivovarov - Github: simplify mapping user -> fork repository
ef91648: 2013-09-07 Aleksey Pivovarov - Github: fix remote branch ref
307f921: 2013-09-07 Bas Leijdekkers - IDEA-53184 (False positive unused field inspection for serialVersionUID fields)
c1545b5: 2013-09-06 Vassiliy Kudryashov - Lense mode "internal" preview
5a2c378: 2013-09-06 Roman Shevchenko - platform: correct formatting in downloadable library version chooser
4ffa7ea: 2013-09-06 Konstantin Kolosovsky - IDEA-112802 Fixed parameters for "checkout completed" event
e8a4550: 2013-09-06 peter - there are no constructor field initializers in compiled psi
cee022e: 2013-09-06 peter - IDEA-113013 When insert selected variant is enabled the "generated" code comply with code style
762a0ca: 2013-09-06 peter - empty for loop condition means "true" (IDEA-113242)
75c1cd6: 2013-09-06 peter - IDEA-113149 Constructor parameters completion is not available in case of classes with generics
243adf0: 2013-09-06 peter - IDEA-113028 Complete statement doesn't complete class declaration
9dfa286: 2013-09-06 Anna Kozlova - Merge remote-tracking branch 'origin/master'
d901cc2: 2013-09-06 Anna Kozlova - drop old external annotations format
a0d17e6: 2013-09-06 nik - xdebugger: restored custom presentation for keywords and numbers, changed values are highlighted by coloring their names
65dc74c: 2013-09-06 Sergey Evdokimov - Refactoring: use PsiImplUtil.isLeafElementOfType() instead of org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil.isLeafElementOfType()
5d1dddc: 2013-09-06 peter - fail-fast DfaMemoryStateImpl.equals
59734e3: 2013-09-06 peter - calculate constructor initialization for all fields at once, and cache (needed for dfa and nullable-stuff inspections)
2bad29c: 2013-09-06 peter - 2x faster implicit field nullability detection
1952eee: 2013-09-06 peter - IDEA-112567 Don't show any completion variants after method reference and dot
6b3d77c: 2013-09-06 peter - IDEA-112968 Show "Value is always" warning only for null/true/false
ae94260: 2013-09-06 peter - revert meaningless: use actual (maybe unsaved) psi text for find usages (EA-49575)
4275fcb: 2013-09-06 Anna Kozlova - drop old external annotations format
d34fcc5: 2013-09-06 Anna Kozlova - move: take into account usages which won't be changed textually but could affect possible conflicts (IDEA-113280)
f1b0f11: 2013-09-06 Sergey Simonchik - xdebug api improvement
1a1eacf: 2013-09-06 Konstantin Kolosovsky - IDEA-112802 Initial checkout implementation (with svn command line client)
b7e7f12: 2013-09-06 Sergey Evdokimov - Bug fix: hint "(, )" is shown beside any goal in maven tool window
953771d: 2013-09-06 Sergey Evdokimov - Run completion automatically after inserting of <dependency>
14e7fec: 2013-09-06 Nadya Zabrodina - fix for windows (template need not to be quoted because GeneralCommandline is smart)
f1a9f68: 2013-09-06 Bas Leijdekkers - IDEA-89557 (Inspection `RawUseOfParameterizedType` is redundant on inspection of parameterized type object arrays with the trailing `class` keyword)
80de1ec: 2013-09-06 Bas Leijdekkers - clarify that the "Raw use of parameterized type" inspection mirrors javac's rawtypes warning (IDEA-99892)
6942d1c: 2013-09-06 Bas Leijdekkers - IDEA-99829 (Problem with inspection "Raw use of parameterized class" option "Ignore where a type parameter would not compile.)
b5c1f0e: 2013-09-06 nik - set default dependency scope for framework libraries added to a module
9683169: 2013-09-06 Eugene Zhuravlev - not-null + manager-thread assertions
86f4be9: 2013-09-06 Anna Kozlova - plugins: do not warn about disabled optional dependencies
fb5e6e7: 2013-09-06 Anna Kozlova - plugins downloading: enable dependencies: make suggester answer Yes/No
ac38433: 2013-09-06 Anna Kozlova - optimization: retrieve PsiElement when problem occurs only
9cd0458: 2013-09-06 Dmitry Trofimov - Merge remote-tracking branch 'origin/master'
683ece5: 2013-09-06 nik - xdebugger: 'jump to type source' action added
1448c7d: 2013-09-06 nik - cleanup
4c471d2: 2013-09-06 Vladislav.Soroka - IDEA-102653 tooltip with description added to external project task tree
499cd73: 2013-09-06 Bas Leijdekkers - no generic array creation
6a2d6f4: 2013-09-06 Konstantin Bulenkov - the fix of IDEA-26026 doesn't make sense nowadays. Dialog should be modal IDEA-105611 Invalid focus when invoking find in files
13d56b2: 2013-09-06 Konstantin Kolosovsky - IDEA-94942 Support nullable handler for update commands
9d07f2e: 2013-09-06 Konstantin Kolosovsky - IDEA-94942 Refactored merge, update implementation to use common command listener
8bd8e93: 2013-09-06 Denis Fokin - IDEA-113303 Headless Exception when using inspect.sh on OS X
599c49b: 2013-09-06 Vladimir Krivosheev - init WEB-1171 javascript live console
04b3c6b: 2013-09-06 Konstantin Kolosovsky - IDEA-94942 Force SVNKit implementation for 1.6 working copies
bb8daac: 2013-09-06 Vladimir Krivosheev - investigate: java.lang.IllegalArgumentException: void return types for handler methods not supported
f9f74a5: 2013-09-06 Vladimir Krivosheev - don't hide original exception: java.lang.Exception: java.lang.IllegalStateException: AES/CBC/NoPadding is not available
8df26d7: 2013-09-06 Mikhail Golubev - Merge remote-tracking branch 'origin/master'
87b1100: 2013-09-06 nik - xdebugger api: support grouping values in debugger trees
c1e214a: 2013-09-06 Vladislav.Soroka - IDEA-50450 Gradle code insight
f63250d: 2013-09-04 Alex Ruiz - Disabled "Use embedded Gradle" option for importing project.
517c614: 2013-09-06 Konstantin Bulenkov - remove refs to Project asap
636ac6d: 2013-09-06 Konstantin Bulenkov - IDEA-99897 When "block caret" mode is on, after deleting a character at the end of a line, the character deleted appears in inverse
021d4a5: 2013-06-12 Max Medvedev - Groovy formatter: blank lines in declarations
706feca: 2013-06-12 Max Medvedev - IDEA-113124 Groovy files in the navigation bar
81ba9a5: 2013-09-05 Vladimir Krivosheev - cleanup
198c147: 2013-06-12 Max Medvedev - IDEA-107520 Groovy Shell: support commands in groovy shell
cd1aa72: 2013-06-12 Max Medvedev - IDEA-69673 Generate toString() template Groovy GString style should be added
5e1454a: 2013-06-12 Max Medvedev - generateToString: shorten class references not only for java files
2509702: 2013-06-12 Max Medvedev - don't manually replace toString() if it exists; generate the new one in the appropriate place instead
2e72f08: 2013-06-09 Max Medvedev - Groovy: smart complete type definition body
c8ab923: 2013-06-09 Max Medvedev - Groovy: In-place introduce parameter: delegate
98ae7ed: 2013-09-04 Bas Leijdekkers - Fix all known "Field may be final" inspection problems 2 (IDEA-75321, IDEA-80439, IDEA-84561, IDEA-84614, IDEA-87373,IDEA-89711, IDEA-91969, IDEA-111396)
24184340: 2013-09-05 peter - update FixAllQuickfixTest test data, so that it identifies the quick fix unambiguously
082a0f9: 2013-09-05 Konstantin Bulenkov - make search everywhere available in current context
4eaae16: 2013-09-05 Konstantin Bulenkov - remove dead code
dde304f: 2013-09-05 Konstantin Bulenkov - refactor to make autoSelectOnMouseMove available in ListUtil
150d337: 2013-09-05 Dmitry Trofimov - Merge remote-tracking branch 'origin/master'
1790f99: 2013-09-05 Dmitry Trofimov - Merge remote-tracking branch 'origin/master'
981c3f6: 2013-09-05 Sergey Evdokimov - Rename class
06eb88d: 2013-09-05 Sergey Evdokimov - Add test for inserting maven dependency by smart completion
dc54349: 2013-09-05 Konstantin Kolosovsky - Merge branch 'svn1_8_new'
a742e91: 2013-09-05 Dmitry Trofimov - Take correct setting for console background color (PY-10737).
c55ba74: 2013-09-05 Nadya Zabrodina - ShellCommandLine changed to GeneralCommandline to provide shell variables to ide
bb3ff5f: 2013-09-05 Sergey Evdokimov - IDEA-112939 Smart dependency completion for pom.xml
d1daa65: 2013-09-05 Anna Kozlova - fix ranges
5ac8d00: 2013-09-05 Anna Kozlova - accept narrowing conversion from byte[] to T< extends Serializable> (IDEA-113225)
5e7db4f: 2013-09-05 Konstantin Kolosovsky - IDEA-112060 Notification added when working copy format and client version do not correspond to each other
804db7e: 2013-09-05 Konstantin Kolosovsky - IDEA-112060 Force validate executable if project is svn 1.8 working copy
cdc6f6b: 2013-09-05 Konstantin Kolosovsky - IDEA-112071 Refresh svn working copies/statuses if "use command line" option or path to executable changed
613144f: 2013-09-05 Konstantin Kolosovsky - Make equal SvnConfigurable and SvnVcs display names (to "show settings" work correctly)
002eadb: 2013-09-05 Serega Vasiliev - javaee libs,project structure, etc.
559ab96: 2013-09-05 peter - no matter if there are other variables having that constant value, it's still constant
bec4757: 2013-09-04 Mikhail Golubev - * Add error message when template variable used isn't defined * Template variables values are urlencoded during their substitution in URLs
c01b85b: 2013-09-04 Mikhail Golubev - Add sprint.ly integration
68d131b: 2013-09-05 peter - use actual (maybe unsaved) psi text for find usages (EA-49575)
b138d05: 2013-09-05 peter - rely less on mutable state in ChooseByNameBase.getNames (IDEA-112779)
f0dc4b1: 2013-09-05 Anna Kozlova - optimization: skip external usages processing when scope already contains everything
bfb94e0: 2013-09-05 Alexey Kudravtsev - renamed module editor-ui-impl to editor-ui-ex
d711697: 2013-09-05 peter - really focus existing project frame when opening already opened project (related to IDEA-113158)
57d5690: 2013-09-05 Anna Kozlova - logging for EA-49553 - assert: SingleInspectionProfilePanel.copyUsedSeveritiesIfUndefined
ed2cc9b: 2013-09-05 Anna Kozlova - logging for EA-49541 - assert: FileReference.rename
5a3cc7c: 2013-09-05 Roman Shevchenko - test framework: commit or dispose model
0735047: 2013-09-05 Anna Kozlova - scopes: escape dot as it is not a separator in file pattern (IDEA-113148)
6ae3bf7: 2013-09-05 Anna Kozlova - inference graph nodes: merge value/dependencies
f02d237: 2013-09-05 Konstantin Bulenkov - fix test data
830b9c1: 2013-09-05 Konstantin Bulenkov - better english
400062d: 2013-09-05 Sergey Evdokimov - Make GrailsRunConfiguration singleton by default.
8caf8af: 2013-09-05 Vladimir Krivosheev - add javadoc
32394f0: 2013-09-05 Vladimir Krivosheev - WEB-7511 "Evaluate Expression" window does not build correct path to currently selected object node
d59afd6: 2013-09-05 nik - xdebugger: removed duplicated 'Collecting data' text value node
32d3038: 2013-09-05 nik - unused class deleted
42255de: 2013-09-05 nik - xdebugger api streamlined: reworked the way node presentation is customized
36d908c: 2013-09-05 Sergey Evdokimov - IDEA-113188 Go to related files works incorrectly for Model and Controller in Groovy
55a5b28: 2013-09-05 Dmitry Avdeev - final methods in task api
cd0f640: 2013-09-04 Dmitry Avdeev - running tests without ModuleTypeManager
a41a8dc: 2013-09-05 Svetlana.Zemlyanskaya - Arrangement: make tokens aware of their type (author=Roman.Shein)
20bfe63: 2013-06-09 Max Medvedev - IDEA-71176 Encapsulate Java fields should update Groovy usages
30889b4: 2013-06-08 Max Medvedev - pluggable EncapsulateFields refactoring
a3ed6bd: 2013-06-08 Max Medvedev - refactor EncapsulateFieldProcessor
b7103d5: 2013-09-04 Max Medvedev - IDEA-113176 Groovy: place caret inside parentheses when compliting constructors
b44e415: 2013-09-04 Vladimir Krivosheev - NotNull, StreamProvider.listSubFiles accept roaming type
89f6078: 2013-09-04 Vladimir Krivosheev - init WEB-7511 "Evaluate Expression" window does not build correct path to currently selected object node Now only hint show correct evaluated expression
faaea11: 2013-09-04 Vladimir Krivosheev - remove deprecated method
98d4f5e: 2013-09-04 Vladimir Krivosheev - cleanup, remove deprecated method
f4a27e8: 2013-09-04 peter - CachedValueProvider.Result: force non-empty list of not-null dependencies
19df6f4: 2013-09-04 Dmitry Trofimov - Merge remote-tracking branch 'origin/master'
b12d474: 2013-09-04 Andrey Vlasovskikh - Merge branch 'python-fixes'
824377b: 2013-09-04 Andrey Vlasovskikh - Use new serializer for Python shadowing inspection
9bc2733: 2013-09-04 peter - single-pass control flow building
257d23a: 2013-09-04 peter - IDEA-112474 Expression might evaluate to null and not @Nullable annotated inspection is not aware of @Contract
e586777: 2013-09-04 peter - a more descriptive DupInstruction.toString
9c9e366: 2013-09-04 peter - dfa: pop all the contract-unchecked arguments from stack (IDEA-112500)
6c2ead1: 2013-09-04 jgindin - Branch view in RepositoryTab
616f50f: 2013-09-04 Konstantin Kolosovsky - Merge branch 'svn1_8_new'
631a6ae: 2013-09-04 Konstantin Bulenkov - IDEA-113217 Check spelling and grammar in Community Bundles
45009eb: 2013-09-04 Konstantin Bulenkov - IDEA-113216 Darcula: Equal sign is too bright in properties files
711b2f5: 2013-09-04 Konstantin Kolosovsky - IDEA-94942 Force separate SVNKit client for each info request (to prevent multithreaded issues)
9ea7a68: 2013-09-04 Konstantin Bulenkov - IDEA-113215 GSP looks weird under Darcula
76f2e32: 2013-09-04 Konstantin Kolosovsky - IDEA-94942 Removed unused JavaHL code
3a8a697: 2013-09-04 Vladimir Krivosheev - fix possible NPE
1dd1635: 2013-09-04 Vladimir Krivosheev - We must not use variable if it is not yet set — we must set channel in "init" handler, but not in "connected" handler. Issue is actual under windows (I don't know why).
4860142: 2013-09-04 Mikhail Golubev - Change TaskBuilder constructor: repository field is mandatory
ccb5502: 2013-09-04 Dmitry Trofimov - Merge remote-tracking branch 'origin/master'
d43513f: 2013-09-03 Dmitry Trofimov - Variable view in Python Console.
dd251c7: 2013-09-03 Dmitry Trofimov - Merge remote-tracking branch 'origin/master'
dc83844: 2013-09-03 Dmitry Trofimov - Prevent CCE.
Change-Id: I9ce8f336e5ab08b9a26d806a3faa8db7e0d9813f
Diffstat (limited to 'xml')
7 files changed, 132 insertions, 120 deletions
diff --git a/xml/impl/src/com/intellij/ide/browsers/LocalFileUrl.java b/xml/impl/src/com/intellij/ide/browsers/LocalFileUrl.java index 7307725b6082..026133e0278b 100644 --- a/xml/impl/src/com/intellij/ide/browsers/LocalFileUrl.java +++ b/xml/impl/src/com/intellij/ide/browsers/LocalFileUrl.java @@ -68,6 +68,11 @@ public final class LocalFileUrl implements Url { } @Override + public boolean equalsIgnoreParameters(@Nullable Url url) { + return equals(url); + } + + @Override public int hashCode() { return path.hashCode(); } diff --git a/xml/impl/src/com/intellij/ide/browsers/UrlImpl.java b/xml/impl/src/com/intellij/ide/browsers/UrlImpl.java index 05fa403faf67..a54887877014 100644 --- a/xml/impl/src/com/intellij/ide/browsers/UrlImpl.java +++ b/xml/impl/src/com/intellij/ide/browsers/UrlImpl.java @@ -146,13 +146,23 @@ public final class UrlImpl implements Url { } UrlImpl url = (UrlImpl)o; - if (!scheme.equals(url.scheme)) { + return equalsIgnoreParameters(url) && (parameters == null ? url.parameters == null : parameters.equals(url.parameters)); + } + + @Override + public boolean equalsIgnoreParameters(@Nullable Url o) { + if (this == o) { + return true; + } + if (!(o instanceof UrlImpl)) { return false; } - if (authority != null ? !authority.equals(url.authority) : url.authority != null) { + + UrlImpl url = (UrlImpl)o; + if (!scheme.equals(url.scheme)) { return false; } - if (parameters != null ? !parameters.equals(url.parameters) : url.parameters != null) { + if (authority == null ? url.authority != null : !authority.equals(url.authority)) { return false; } String decodedPath = getPath(); diff --git a/xml/openapi/src/com/intellij/ide/browsers/Url.java b/xml/openapi/src/com/intellij/ide/browsers/Url.java index 4320ee98c242..bc913d470a1c 100644 --- a/xml/openapi/src/com/intellij/ide/browsers/Url.java +++ b/xml/openapi/src/com/intellij/ide/browsers/Url.java @@ -25,4 +25,6 @@ public interface Url { @Nullable String getParametersPart(); + + boolean equalsIgnoreParameters(@Nullable Url url); } diff --git a/xml/relaxng/testData/highlighting/simple-attribute_2.xml b/xml/relaxng/testData/highlighting/simple-attribute_2.xml index af6d9cc8e0b7..73f7e52606d4 100644 --- a/xml/relaxng/testData/highlighting/simple-attribute_2.xml +++ b/xml/relaxng/testData/highlighting/simple-attribute_2.xml @@ -1,2 +1,2 @@ -<<error>simple-attribute</error> xmlns="urn:test:simple.rng"> -</<error>simple-attribute</error>>
\ No newline at end of file +<<error descr="Element simple-attribute doesn't have required attribute x">simple-attribute</error> xmlns="urn:test:simple.rng"> +</<error descr="Element simple-attribute doesn't have required attribute x">simple-attribute</error>>
\ No newline at end of file diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java b/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java index e09bc2264fdc..5cb76ec529ef 100644 --- a/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java +++ b/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java @@ -340,7 +340,7 @@ abstract class BaseHtmlLexer extends DelegateLexer { protected boolean isValidAttributeValueTokenType(final IElementType tokenType) { return tokenType == XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN || tokenType == XmlTokenType.XML_ENTITY_REF_TOKEN || - tokenType == XmlTokenType.XML_CHAR_ENTITY_REF; + tokenType == XmlTokenType.XML_CHAR_ENTITY_REF; } public void advance() { diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.flex b/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.flex index 8def2be62dfb..275c4c957d7e 100644 --- a/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.flex +++ b/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.flex @@ -25,7 +25,7 @@ import com.intellij.psi.xml.*; %class _HtmlLexer %public -%implements FlexLexer,ELHostLexer +%implements FlexLexer %function advance %type IElementType %eof{ return; @@ -124,7 +124,7 @@ CONDITIONAL_COMMENT_CONDITION=({ALPHA})({ALPHA}|{WHITE_SPACE_CHARS}|{DIGIT}|"."| return elTokenType2; } -<ATTRIBUTE_VALUE_START> ([^ \n\r\t\f'\"\>]|(\/[^\>]))* { yybegin(TAG_ATTRIBUTES); return XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN; } +<ATTRIBUTE_VALUE_START> [^ \n\r\t\f'\"\>]([^ \n\r\t\f\>]|(\/[^\>]))* { yybegin(TAG_ATTRIBUTES); return XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN; } <ATTRIBUTE_VALUE_START> "\"" { yybegin(ATTRIBUTE_VALUE_DQ); return XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER; } <ATTRIBUTE_VALUE_START> "'" { yybegin(ATTRIBUTE_VALUE_SQ); return XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER; } diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.java b/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.java index e35b5b91c502..d1e78a6d366a 100644 --- a/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.java +++ b/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.java @@ -1,54 +1,50 @@ -/* - * Copyright 2000-2009 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. - */ - -/* The following code was generated by JFlex 1.4.1 on 01.06.09 13:59 */ +/* The following code was generated by JFlex 1.4.3 on 9/8/13 3:03 PM */ /* It's an automatically generated code. Do not modify it. */ package com.intellij.lexer; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.xml.XmlTokenType; +import com.intellij.psi.*; +import com.intellij.psi.xml.*; /** * This class is a scanner generated by - * <a href="http://www.jflex.de/">JFlex</a> 1.4.1 - * on 01.06.09 13:59 from the specification file - * <tt>C:/Trunk/tools/lexer/_HtmlLexer.flex</tt> + * <a href="http://www.jflex.de/">JFlex</a> 1.4.3 + * on 9/8/13 3:03 PM from the specification file + * <tt>/Users/fedorkorotkov/workspaces/idea/community/xml/xml-psi-impl/src/com/intellij/lexer/_HtmlLexer.flex</tt> */ public class _HtmlLexer implements FlexLexer { /** initial size of the lookahead buffer */ private static final int ZZ_BUFFERSIZE = 16384; /** lexical states */ - public static final int PROCESSING_INSTRUCTION = 9; - public static final int C_COMMENT_END = 14; - public static final int END_TAG_NAME = 4; - public static final int START_TAG_NAME = 3; - public static final int ATTRIBUTE_VALUE_SQ = 8; - public static final int DOC_TYPE = 1; - public static final int ATTRIBUTE_VALUE_DQ = 7; + public static final int PROCESSING_INSTRUCTION = 18; + public static final int C_COMMENT_END = 28; + public static final int END_TAG_NAME = 8; + public static final int START_TAG_NAME = 6; + public static final int ATTRIBUTE_VALUE_SQ = 16; + public static final int DOC_TYPE = 2; + public static final int ATTRIBUTE_VALUE_DQ = 14; public static final int YYINITIAL = 0; - public static final int TAG_CHARACTERS = 12; - public static final int START_TAG_NAME2 = 10; - public static final int TAG_ATTRIBUTES = 5; - public static final int COMMENT = 2; - public static final int ATTRIBUTE_VALUE_START = 6; - public static final int C_COMMENT_START = 13; - public static final int END_TAG_NAME2 = 11; + public static final int TAG_CHARACTERS = 24; + public static final int START_TAG_NAME2 = 20; + public static final int TAG_ATTRIBUTES = 10; + public static final int COMMENT = 4; + public static final int ATTRIBUTE_VALUE_START = 12; + public static final int C_COMMENT_START = 26; + public static final int END_TAG_NAME2 = 22; + + /** + * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l + * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l + * at the beginning of a line + * l is of the form l = 2*k, k a non negative integer + */ + private static final int ZZ_LEXSTATE[] = { + 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, + 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14 + }; /** * Translates characters to character classes @@ -129,15 +125,15 @@ public class _HtmlLexer implements FlexLexer { private static final int [] ZZ_ACTION = zzUnpackAction(); private static final String ZZ_ACTION_PACKED_0 = - "\1\1\5\0\1\2\2\0\1\3\5\0\1\1\1\4"+ - "\5\1\1\5\1\6\4\5\1\7\1\5\4\10\1\11"+ - "\1\12\1\13\1\14\2\12\1\15\1\16\1\12\1\17"+ - "\1\2\1\20\1\21\2\2\1\22\1\23\4\22\1\3"+ - "\1\24\1\5\1\25\3\26\1\27\1\10\3\27\1\30"+ - "\1\31\1\32\1\0\1\33\1\34\15\0\1\34\1\35"+ - "\2\2\3\0\1\36\2\0\1\37\1\40\1\41\1\42"+ - "\11\0\1\43\1\44\1\0\1\45\1\2\1\45\1\46"+ - "\1\0\1\47\3\0\1\15\3\0\1\50\2\0\1\51"; + "\1\1\10\0\1\2\5\0\1\1\1\3\5\1\1\4"+ + "\1\5\4\4\1\6\1\4\4\7\1\10\1\11\1\12"+ + "\1\13\2\11\1\14\1\15\1\11\1\16\1\17\1\20"+ + "\1\21\2\17\1\22\1\23\4\22\1\2\1\24\1\4"+ + "\1\25\3\26\1\27\1\7\3\27\1\30\1\31\1\32"+ + "\1\0\1\33\1\34\15\0\1\34\1\35\2\17\3\0"+ + "\1\36\2\0\1\37\1\40\1\41\1\42\11\0\1\43"+ + "\1\44\1\0\1\45\1\17\1\45\1\46\1\0\1\47"+ + "\3\0\1\14\3\0\1\50\2\0\1\51"; private static int [] zzUnpackAction() { int [] result = new int[129]; @@ -239,49 +235,48 @@ public class _HtmlLexer implements FlexLexer { "\33\0\2\123\47\0\2\124\50\0\1\125\70\0\1\126"+ "\51\0\2\45\1\0\3\45\5\0\24\45\15\0\7\45"+ "\47\0\1\127\15\0\2\51\1\0\3\51\5\0\24\51"+ - "\15\0\7\51\43\0\1\130\20\0\3\55\1\0\4\55"+ - "\2\0\31\55\1\0\3\55\1\131\17\55\1\0\4\55"+ - "\2\0\27\55\1\132\1\55\1\0\3\55\1\131\57\55"+ - "\1\130\3\55\1\131\14\55\41\0\1\133\62\0\1\62"+ - "\64\0\1\134\22\0\43\70\1\0\2\70\1\135\60\70"+ - "\1\71\20\70\1\0\2\73\1\0\3\73\5\0\24\73"+ - "\15\0\7\73\1\0\3\100\1\0\1\100\5\0\25\100"+ - "\4\0\2\100\7\0\7\100\43\0\1\136\21\0\2\105"+ - "\1\0\3\105\5\0\24\105\15\0\7\105\1\0\2\106"+ - "\1\0\3\106\5\0\24\106\15\0\7\106\6\0\1\137"+ - "\5\0\1\140\50\0\1\141\2\0\1\141\2\0\1\142"+ - "\4\0\24\141\15\0\7\141\42\112\1\143\21\112\1\0"+ - "\2\113\1\0\3\113\5\0\24\113\14\0\1\144\7\113"+ - "\2\0\1\145\57\0\1\146\2\0\2\113\1\0\3\113"+ - "\5\0\5\113\1\147\16\113\14\0\1\144\7\113\1\0"+ - "\2\113\1\0\3\113\5\0\10\113\1\150\3\113\1\151"+ - "\7\113\14\0\1\144\7\113\1\0\2\113\1\0\3\113"+ - "\5\0\20\113\1\152\3\113\14\0\1\144\7\113\1\0"+ - "\2\113\1\0\3\113\5\0\22\113\1\153\1\113\14\0"+ - "\1\144\7\113\35\0\2\154\54\0\2\155\36\0\1\125"+ - "\37\0\1\156\70\0\1\157\13\0\43\55\1\0\3\55"+ - "\1\131\14\55\3\132\1\160\4\132\2\160\30\132\1\161"+ - "\1\160\3\132\1\162\14\132\10\133\1\0\31\133\1\163"+ - "\21\133\11\134\1\0\30\134\1\163\21\134\43\70\1\0"+ - "\20\70\6\0\1\164\72\0\2\165\46\0\2\141\1\0"+ - "\3\141\5\0\24\141\15\0\7\141\1\0\2\142\1\0"+ - "\3\142\5\0\24\142\15\0\7\142\2\0\1\145\51\0"+ - "\1\166\11\0\1\167\11\0\1\167\2\0\1\167\5\0"+ - "\1\167\7\0\2\167\17\0\1\167\4\0\1\167\1\0"+ - "\2\113\1\0\3\113\5\0\24\113\14\0\1\166\7\113"+ - "\1\0\2\113\1\0\3\113\5\0\2\113\1\170\21\113"+ - "\14\0\1\144\7\113\1\0\2\113\1\0\3\113\5\0"+ - "\10\113\1\147\13\113\14\0\1\144\7\113\1\0\2\113"+ - "\1\0\3\113\5\0\2\113\1\115\21\113\14\0\1\144"+ - "\7\113\1\0\2\113\1\0\3\113\5\0\24\113\14\0"+ - "\1\144\2\113\1\151\4\113\31\0\2\171\62\0\2\172"+ - "\31\0\42\160\1\163\21\160\42\132\1\161\1\160\3\132"+ - "\1\162\14\132\17\0\1\173\46\0\1\167\11\0\1\167"+ - "\2\0\1\167\5\0\1\167\7\0\2\167\15\0\1\166"+ - "\1\0\1\167\4\0\1\167\1\0\2\113\1\0\3\113"+ - "\5\0\24\113\14\0\1\144\2\113\1\147\4\113\37\0"+ - "\1\174\44\0\2\175\61\0\1\176\66\0\1\177\64\0"+ - "\2\200\64\0\1\201\36\0"; + "\15\0\7\51\43\0\1\130\20\0\3\55\1\0\37\55"+ + "\1\0\3\55\1\131\17\55\1\0\35\55\1\132\1\55"+ + "\1\0\3\55\1\131\17\55\1\0\37\55\1\130\3\55"+ + "\1\131\14\55\41\0\1\133\62\0\1\62\64\0\1\134"+ + "\22\0\43\70\1\0\2\70\1\135\60\70\1\71\20\70"+ + "\1\0\2\73\1\0\3\73\5\0\24\73\15\0\7\73"+ + "\1\0\3\100\1\0\1\100\5\0\25\100\4\0\2\100"+ + "\7\0\7\100\43\0\1\136\21\0\2\105\1\0\3\105"+ + "\5\0\24\105\15\0\7\105\1\0\2\106\1\0\3\106"+ + "\5\0\24\106\15\0\7\106\6\0\1\137\5\0\1\140"+ + "\50\0\1\141\2\0\1\141\2\0\1\142\4\0\24\141"+ + "\15\0\7\141\42\112\1\143\21\112\1\0\2\113\1\0"+ + "\3\113\5\0\24\113\14\0\1\144\7\113\2\0\1\145"+ + "\57\0\1\146\2\0\2\113\1\0\3\113\5\0\5\113"+ + "\1\147\16\113\14\0\1\144\7\113\1\0\2\113\1\0"+ + "\3\113\5\0\10\113\1\150\3\113\1\151\7\113\14\0"+ + "\1\144\7\113\1\0\2\113\1\0\3\113\5\0\20\113"+ + "\1\152\3\113\14\0\1\144\7\113\1\0\2\113\1\0"+ + "\3\113\5\0\22\113\1\153\1\113\14\0\1\144\7\113"+ + "\35\0\2\154\54\0\2\155\36\0\1\125\37\0\1\156"+ + "\70\0\1\157\13\0\43\55\1\0\3\55\1\131\14\55"+ + "\3\132\1\160\36\132\1\161\1\160\3\132\1\162\14\132"+ + "\10\133\1\0\31\133\1\163\21\133\11\134\1\0\30\134"+ + "\1\163\21\134\43\70\1\0\20\70\6\0\1\164\72\0"+ + "\2\165\46\0\2\141\1\0\3\141\5\0\24\141\15\0"+ + "\7\141\1\0\2\142\1\0\3\142\5\0\24\142\15\0"+ + "\7\142\2\0\1\145\51\0\1\166\11\0\1\167\11\0"+ + "\1\167\2\0\1\167\5\0\1\167\7\0\2\167\17\0"+ + "\1\167\4\0\1\167\1\0\2\113\1\0\3\113\5\0"+ + "\24\113\14\0\1\166\7\113\1\0\2\113\1\0\3\113"+ + "\5\0\2\113\1\170\21\113\14\0\1\144\7\113\1\0"+ + "\2\113\1\0\3\113\5\0\10\113\1\147\13\113\14\0"+ + "\1\144\7\113\1\0\2\113\1\0\3\113\5\0\2\113"+ + "\1\115\21\113\14\0\1\144\7\113\1\0\2\113\1\0"+ + "\3\113\5\0\24\113\14\0\1\144\2\113\1\151\4\113"+ + "\31\0\2\171\62\0\2\172\31\0\42\160\1\163\21\160"+ + "\42\132\1\161\1\160\3\132\1\162\14\132\17\0\1\173"+ + "\46\0\1\167\11\0\1\167\2\0\1\167\5\0\1\167"+ + "\7\0\2\167\15\0\1\166\1\0\1\167\4\0\1\167"+ + "\1\0\2\113\1\0\3\113\5\0\24\113\14\0\1\144"+ + "\2\113\1\147\4\113\37\0\1\174\44\0\2\175\61\0"+ + "\1\176\66\0\1\177\64\0\2\200\64\0\1\201\36\0"; private static int [] zzUnpackTrans() { int [] result = new int[4576]; @@ -325,14 +320,14 @@ public class _HtmlLexer implements FlexLexer { private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\1\1\5\0\1\1\2\0\1\1\5\0\2\1\1\11"+ - "\4\1\1\11\5\1\1\11\1\1\1\11\3\1\2\11"+ - "\1\1\1\11\3\1\1\11\1\1\1\11\1\1\2\11"+ - "\2\1\2\11\5\1\1\11\2\1\1\11\2\1\1\11"+ - "\4\1\1\11\2\1\1\0\1\11\1\1\15\0\2\11"+ - "\2\1\3\0\1\11\2\0\2\1\2\11\11\0\2\11"+ - "\1\0\2\1\2\11\1\0\1\11\3\0\1\11\3\0"+ - "\1\11\2\0\1\11"; + "\1\1\10\0\1\1\5\0\2\1\1\11\4\1\1\11"+ + "\5\1\1\11\1\1\1\11\3\1\2\11\1\1\1\11"+ + "\3\1\1\11\1\1\1\11\1\1\2\11\2\1\2\11"+ + "\5\1\1\11\2\1\1\11\2\1\1\11\4\1\1\11"+ + "\2\1\1\0\1\11\1\1\15\0\2\11\2\1\3\0"+ + "\1\11\2\0\2\1\2\11\11\0\2\11\1\0\2\1"+ + "\2\11\1\0\1\11\3\0\1\11\3\0\1\11\2\0"+ + "\1\11"; private static int [] zzUnpackAttribute() { int [] result = new int[129]; @@ -605,14 +600,14 @@ public class _HtmlLexer implements FlexLexer { zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; - zzState = zzLexicalState; + zzState = ZZ_LEXSTATE[zzLexicalState]; zzForAction: { while (true) { if (zzCurrentPosL < zzEndReadL) - zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++]:zzBufferL.charAt(zzCurrentPosL++); + zzInput = (zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++)); else if (zzAtEOF) { zzInput = YYEOF; break zzForAction; @@ -632,7 +627,7 @@ public class _HtmlLexer implements FlexLexer { break zzForAction; } else { - zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++]:zzBufferL.charAt(zzCurrentPosL++); + zzInput = (zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++)); } } int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ]; @@ -665,7 +660,7 @@ public class _HtmlLexer implements FlexLexer { { return XmlTokenType.XML_TAG_CHARACTERS; } case 44: break; - case 15: + case 14: { yybegin(ATTRIBUTE_VALUE_START); return XmlTokenType.XML_EQ; } case 45: break; @@ -673,7 +668,7 @@ public class _HtmlLexer implements FlexLexer { { return elTokenType; } case 46: break; - case 13: + case 12: { return XmlTokenType.XML_NAME; } case 47: break; @@ -681,7 +676,7 @@ public class _HtmlLexer implements FlexLexer { { yybegin(TAG_ATTRIBUTES); return XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER; } case 48: break; - case 10: + case 9: { yybegin(YYINITIAL); yypushback(1); break; } case 49: break; @@ -693,7 +688,7 @@ public class _HtmlLexer implements FlexLexer { { yybegin(COMMENT); return XmlTokenType.XML_COMMENT_START; } case 51: break; - case 4: + case 3: { return XmlTokenType.XML_REAL_WHITE_SPACE; } case 52: break; @@ -713,11 +708,11 @@ public class _HtmlLexer implements FlexLexer { { yybegin(END_TAG_NAME2); yypushback(yylength()); } case 56: break; - case 5: + case 4: { return XmlTokenType.XML_BAD_CHARACTER; } case 57: break; - case 14: + case 13: { yybegin(YYINITIAL); return XmlTokenType.XML_TAG_END; } case 58: break; @@ -737,7 +732,7 @@ public class _HtmlLexer implements FlexLexer { { yybegin(DOC_TYPE); return XmlTokenType.XML_DOCTYPE_START; } case 62: break; - case 3: + case 2: { return XmlTokenType.XML_PI_TARGET; } case 63: break; @@ -753,7 +748,7 @@ public class _HtmlLexer implements FlexLexer { { yybegin(PROCESSING_INSTRUCTION); return XmlTokenType.XML_PI_START; } case 66: break; - case 9: + case 8: { yybegin(C_COMMENT_START); return XmlTokenType.XML_CONDITIONAL_COMMENT_START; } case 67: break; @@ -761,7 +756,7 @@ public class _HtmlLexer implements FlexLexer { { yybegin(TAG_CHARACTERS); return XmlTokenType.XML_NAME; } case 68: break; - case 7: + case 6: { yybegin(YYINITIAL); return XmlTokenType.XML_DOCTYPE_END; } case 69: break; @@ -769,11 +764,11 @@ public class _HtmlLexer implements FlexLexer { { return XmlTokenType.XML_CHAR_ENTITY_REF; } case 70: break; - case 12: + case 11: { return XmlTokenType.XML_START_TAG_START; } case 71: break; - case 6: + case 5: { return XmlTokenType.XML_WHITE_SPACE; } case 72: break; @@ -801,7 +796,7 @@ public class _HtmlLexer implements FlexLexer { { yybegin(ATTRIBUTE_VALUE_SQ); return XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER; } case 78: break; - case 11: + case 10: { yybegin(TAG_ATTRIBUTES); return XmlTokenType.XML_NAME; } case 79: break; @@ -809,11 +804,11 @@ public class _HtmlLexer implements FlexLexer { { yybegin(START_TAG_NAME2); yypushback(yylength()); } case 80: break; - case 2: + case 15: { yybegin(TAG_ATTRIBUTES); return XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN; } case 81: break; - case 8: + case 7: { return XmlTokenType.XML_COMMENT_CHARACTERS; } case 82: break; |