MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

Usages StdFileTypes replaced

Browse Source 
GitOrigin-RevId: e65994db507f0b27cc6afe3060367f0e2d6a4bdc
This commit is contained in:
Tagir Valeev
2020-05-26 17:28:22 +07:00
committed by intellij-monorepo-bot
parent c5b6eb20b3
commit c985bb2d5e
36 changed files with 89 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeConversionDescriptor.java
View File

@@ -1,7 +1,7 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.refactoring.typeMigration;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.openapi.project.Project;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiExpression;
@@ -89,7 +89,7 @@ public class TypeConversionDescriptor extends TypeConversionDescriptorBase {
Project project = expression.getProject();
final ReplaceOptions options = new ReplaceOptions();
final MatchOptions matchOptions = options.getMatchOptions();
matchOptions.setFileType(StdFileTypes.JAVA);
matchOptions.setFileType(JavaFileType.INSTANCE);
final String replacement = Replacer.testReplace(expression.getText(), stringToReplace, replaceByString, options, project);
return (PsiExpression)JavaCodeStyleManager.getInstance(project).shortenClassReferences(expression.replace(
JavaPsiFacade.getElementFactory(project).createExpressionFromText(replacement, expression)));

6
java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaOptionalConversionUtil.java
View File

@@ -1,7 +1,7 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.refactoring.typeMigration.rules.guava;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.psi.*;
import com.intellij.structuralsearch.MatchOptions;
import com.intellij.structuralsearch.MatchResult;
@@ -36,9 +36,9 @@ public class GuavaOptionalConversionUtil {
final PsiExpression expression = expressions[0];
final MatchOptions options = new MatchOptions();
options.setSearchPattern(GuavaOptionalConversionRule.OPTIONAL_CONVERTOR_PATTERN);
options.setFileType(StdFileTypes.JAVA);
options.setFileType(JavaFileType.INSTANCE);
final Matcher matcher = new Matcher(methodCall.getProject(), options);
final List<MatchResult> results = matcher.testFindMatches(expression.getText(), false, StdFileTypes.JAVA, false);
final List<MatchResult> results = matcher.testFindMatches(expression.getText(), false, JavaFileType.INSTANCE, false);
if (!results.isEmpty()) {
final MatchResult result = results.get(0);
if (result.getStart() == 0 && result.getEnd() == -1) {