Merge branch 'configure-code-style-on-selected-fragment'
authorYaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Fri, 13 Mar 2015 17:27:43 +0000 (20:27 +0300)
committerYaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Fri, 13 Mar 2015 17:27:43 +0000 (20:27 +0300)
1  2 
platform/platform-resources-en/src/messages/CodeInsightBundle.properties
platform/platform-resources/src/META-INF/LangExtensions.xml

index 2535e21b76be7361fbd5da83e367505cc89ec636,96577cbc5c796f1d7e5e008a4fc7cab7b1dd3ac8..86141c214bbd7985cf65fac6d13beb2d23b00e36
@@@ -7,7 -7,7 +7,7 @@@ reformat.directory.dialog.filters=Filte
  process.scope.directory=Directory ''{0}''
  process.scope.project=Project ''{0}''
  process.scope.module=Module ''{0}''
 -process.scope.changed.files=only VCS changed files
 +process.scope.changed.files=process only VCS changed files
  reformat.code.accept.button.text=Run
  process.scope.file=&File {0}
  reformat.option.selected.text=&Selected text
@@@ -19,6 -19,10 +19,10 @@@ reformat.option.vcs.changed.region=Onl
  reformat.progress.file.with.known.name.text=Reformatting {0}
  reformat.and.optimize.progress.common.text=Preparing imports...
  reformat.progress.common.text=Reformatting code...
+ configure.code.style.on.fragment.dialog.title=Configure Code Style
+ configure.code.style.on.fragment.dialog.cancel=Skip
+ configure.code.style.on.fragment.dialog.progress.text=Filtering settings affecting selected code fragment...
+ configure.code.style.on.fragment.dialog.progress.text.under=Press 'Skip' to show all settings
  process.optimize.imports=Optimize Imports
  process.optimize.imports.before.commit=Optimize Imports Before Commit
  progress.text.optimizing.imports=Optimizing imports...
@@@ -283,7 -287,7 +287,7 @@@ goto.test.findUsages.subject.title=Tes
  goto.test.notFound=No test subjects found
  
  incremental.search.tooltip.prefix=Search for:
 -goto.super.field.chooser.title=Choose super field
 +goto.super.property.chooser.title=Choose super property
  goto.super.method.chooser.title=Choose super method
  goto.super.method.of.chooser.title=Choose Super Method of {0}
  goto.super.method.findUsages.title=Super methods of {0}
index d7a15abbbeab5867013af2931e5663ca2a276fd3,18077f8d8b771bbd2c5930c4db89f4d2a51f0df3..e84b6d000fa34a4e0d1406a7fed70b2802583d2d
  
      <lang.parserDefinition language="TEXT" implementationClass="com.intellij.openapi.fileTypes.PlainTextParserDefinition"/>
      <lang.syntaxHighlighterFactory key="TEXT" implementationClass="com.intellij.openapi.fileTypes.PlainTextSyntaxHighlighterFactory"/>
 -    <braceMatcher filetype="PLAIN_TEXT" implementationClass="com.intellij.ide.highlighter.custom.impl.CustomFileTypeBraceMatcher"/>
 +    <lang.braceMatcher language="TEXT" implementationClass="com.intellij.ide.highlighter.custom.impl.CustomFileTypeBraceMatcher"/>
 +    <lang.quoteHandler language="TEXT" implementationClass="com.intellij.ide.highlighter.custom.impl.CustomFileTypeQuoteHandler"/>
      <lang.ast.factory language="TEXT" implementationClass="com.intellij.psi.impl.source.tree.PlainTextASTFactory"/>
  
      <getDataRule key="psi.File" implementationClass="com.intellij.ide.impl.dataRules.PsiFileRule"/>
      <intentionAction>
        <className>com.intellij.codeInsight.intention.impl.EditFoldingOptionsAction</className>
      </intentionAction>
+     <intentionAction>
+       <className>com.intellij.formatting.contextConfiguration.ConfigureCodeStyleOnSelectedFragment</className>
+     </intentionAction>
      <intentionAction>
        <className>com.intellij.codeInsight.intention.impl.QuickEditAction</className>
        <category>Language Injection</category>
                      serviceImplementation="com.intellij.ide.projectView.impl.ProjectViewImpl"/>
      <projectService serviceInterface="com.intellij.execution.ui.RunnerLayoutUi$Factory"
                      serviceImplementation="com.intellij.execution.ui.layout.impl.RunnerLayoutUiFactoryImpl"/>
 -    <projectService serviceInterface="com.intellij.compiler.ProblemsView"
 -                    serviceImplementation="com.intellij.compiler.impl.ProblemsViewImpl"/>
  
      <http.fileEditorActionProvider implementation="com.intellij.openapi.fileEditor.impl.http.LangRemoteFileEditorActionProvider"/>