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

cleanup

Browse Source 
GitOrigin-RevId: 65459211d22c043ff328c47be84f08da51924a56
This commit is contained in:
Vladimir Krivosheev
2021-12-23 07:51:49 +01:00
committed by intellij-monorepo-bot
parent 4c792a72c6
commit ea4d27db1d
5 changed files with 109 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
images/resources/intellij.platform.images.copyright.xml
View File

@@ -1,5 +1,4 @@
<idea-plugin package="org.intellij.images.copyright">
<dependencies>
<plugin id="com.intellij.copyright"/>
</dependencies>

4
images/src/org/intellij/images/copyright/SvgCopyrightUpdater.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.intellij.images.copyright;
import com.intellij.openapi.fileTypes.FileType;
@@ -15,7 +15,6 @@ import org.intellij.images.fileTypes.impl.SvgFileType;
* @author Konstantin Bulenkov
*/
final class SvgCopyrightUpdater extends UpdateCopyrightsProvider {
@Override
public UpdateCopyright createInstance(Project project,
Module module,
@@ -26,7 +25,6 @@ final class SvgCopyrightUpdater extends UpdateCopyrightsProvider {
}
private static final class UpdateSvgFileCopyright extends UpdateXmlCopyrightsProvider.UpdateXmlFileCopyright {
UpdateSvgFileCopyright(Project project,
Module module,
VirtualFile file,

9
plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightsProvider.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.maddyhome.idea.copyright.psi;
import com.intellij.openapi.fileTypes.FileType;
@@ -15,8 +15,11 @@ public abstract class UpdateCopyrightsProvider {
/**
* @return {@link UpdateCopyright} for the file. In most cases, {@link UpdatePsiFileCopyright} would be used
*/
public abstract UpdateCopyright createInstance(Project project, Module module, VirtualFile file,
FileType base, CopyrightProfile options);
public abstract UpdateCopyright createInstance(Project project,
Module module,
VirtualFile file,
FileType base,
CopyrightProfile options);
public LanguageOptions getDefaultOptions() {
return new LanguageOptions();

5
plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePsiFileCopyright.java
View File

@@ -1,5 +1,4 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.maddyhome.idea.copyright.psi;
import com.intellij.copyright.CopyrightBundle;
@@ -410,7 +409,7 @@ public abstract class UpdatePsiFileCopyright extends AbstractUpdateCopyright {
}
}
protected static class CommentAction implements Comparable<CommentAction> {
protected static final class CommentAction implements Comparable<CommentAction> {
public static final int ACTION_INSERT = 1;
public static final int ACTION_REPLACE = 2;
public static final int ACTION_DELETE = 3;

228
plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateXmlCopyrightsProvider.java
View File

@@ -1,4 +1,4 @@
// 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.
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.maddyhome.idea.copyright.psi;
import com.intellij.openapi.diagnostic.Logger;
@@ -23,146 +23,118 @@ public final class UpdateXmlCopyrightsProvider extends UpdateCopyrightsProvider
return createDefaultOptions(false);
}
public static class UpdateXmlFileCopyright extends UpdatePsiFileCopyright
{
public UpdateXmlFileCopyright(Project project, Module module, VirtualFile root, CopyrightProfile options)
{
super(project, module, root, options);
public static class UpdateXmlFileCopyright extends UpdatePsiFileCopyright {
public UpdateXmlFileCopyright(Project project, Module module, VirtualFile root, CopyrightProfile options) {
super(project, module, root, options);
}
@Override
protected boolean accept() {
return getFile() instanceof XmlFile;
}
@Override
protected void scanFile() {
logger.debug("updating " + getFile().getVirtualFile());
XmlDoctype doctype = null;
PsiElement root = null;
XmlDocument doc = ((XmlFile)getFile()).getDocument();
PsiElement elem = doc.getFirstChild();
while (elem != null) {
if (elem instanceof XmlProlog) {
PsiElement prolog = elem.getFirstChild();
while (prolog != null) {
if (prolog instanceof XmlDoctype) {
doctype = (XmlDoctype)prolog;
}
prolog = prolog.getNextSibling();
}
}
else if (elem instanceof XmlTag || elem instanceof XmlElementDecl || elem instanceof XmlAttributeDecl) {
root = elem;
break;
}
elem = elem.getNextSibling();
}
@Override
protected boolean accept()
{
return getFile() instanceof XmlFile;
PsiElement first = doc.getFirstChild();
if (root == null) {
root = doc.getLastChild();
}
@Override
protected void scanFile()
{
logger.debug("updating " + getFile().getVirtualFile());
XmlDoctype doctype = null;
PsiElement root = null;
XmlDocument doc = ((XmlFile)getFile()).getDocument();
PsiElement elem = doc.getFirstChild();
while (elem != null)
{
if (elem instanceof XmlProlog)
{
PsiElement prolog = elem.getFirstChild();
while (prolog != null)
{
if (prolog instanceof XmlDoctype)
{
doctype = (XmlDoctype)prolog;
}
prolog = prolog.getNextSibling();
}
}
else if (elem instanceof XmlTag || elem instanceof XmlElementDecl || elem instanceof XmlAttributeDecl)
{
root = elem;
break;
}
elem = elem.getNextSibling();
}
PsiElement first = doc.getFirstChild();
if (root == null)
{
root = doc.getLastChild();
}
int location = getLanguageOptions().getFileLocation();
if (doctype != null)
{
checkComments(first, doctype, location == XmlOptions.LOCATION_BEFORE_DOCTYPE);
first = doctype;
}
else if (location == XmlOptions.LOCATION_BEFORE_DOCTYPE)
{
location = XmlOptions.LOCATION_BEFORE_ROOTTAG;
}
if (root != null)
{
checkComments(first, root, location == XmlOptions.LOCATION_BEFORE_ROOTTAG);
}
else if (location == XmlOptions.LOCATION_BEFORE_ROOTTAG)
{
// If we get here we have an empty file
checkComments(first, first, true);
}
int location = getLanguageOptions().getFileLocation();
if (doctype != null) {
checkComments(first, doctype, location == XmlOptions.LOCATION_BEFORE_DOCTYPE);
first = doctype;
}
else if (location == XmlOptions.LOCATION_BEFORE_DOCTYPE) {
location = XmlOptions.LOCATION_BEFORE_ROOTTAG;
}
@Override
protected PsiElement getPreviousSibling(PsiElement element)
{
if (element == null) return null;
if (root != null) {
checkComments(first, root, location == XmlOptions.LOCATION_BEFORE_ROOTTAG);
}
else if (location == XmlOptions.LOCATION_BEFORE_ROOTTAG) {
// If we get here we have an empty file
checkComments(first, first, true);
}
}
PsiElement res = element.getPrevSibling();
if (res != null)
{
if (res instanceof XmlProlog)
{
XmlProlog prolog = (XmlProlog)res;
if (prolog.getChildren().length > 0)
{
res = prolog.getLastChild();
}
else
{
res = prolog.getPrevSibling();
}
}
}
else
{
if (element.getParent() instanceof XmlProlog)
{
res = element.getParent().getPrevSibling();
}
}
@Override
protected PsiElement getPreviousSibling(PsiElement element) {
if (element == null) return null;
return res;
PsiElement res = element.getPrevSibling();
if (res != null) {
if (res instanceof XmlProlog) {
XmlProlog prolog = (XmlProlog)res;
if (prolog.getChildren().length > 0) {
res = prolog.getLastChild();
}
else {
res = prolog.getPrevSibling();
}
}
}
else {
if (element.getParent() instanceof XmlProlog) {
res = element.getParent().getPrevSibling();
}
}
@Override
protected PsiElement getNextSibling(PsiElement element)
{
if (element == null) return null;
return res;
}
PsiElement res = element instanceof XmlProlog ? element : element.getNextSibling();
if (res != null)
{
if (res instanceof XmlProlog)
{
XmlProlog prolog = (XmlProlog)res;
if (prolog.getChildren().length > 0)
{
res = prolog.getFirstChild();
}
else
{
res = prolog.getNextSibling();
}
}
}
else
{
if (element.getParent() instanceof XmlProlog)
{
res = element.getParent().getNextSibling();
}
}
@Override
protected PsiElement getNextSibling(PsiElement element) {
if (element == null) return null;
return res;
PsiElement res = element instanceof XmlProlog ? element : element.getNextSibling();
if (res != null) {
if (res instanceof XmlProlog) {
XmlProlog prolog = (XmlProlog)res;
if (prolog.getChildren().length > 0) {
res = prolog.getFirstChild();
}
else {
res = prolog.getNextSibling();
}
}
}
else {
if (element.getParent() instanceof XmlProlog) {
res = element.getParent().getNextSibling();
}
}
private static final Logger logger = Logger.getInstance(UpdateXmlFileCopyright.class.getName());
return res;
}
private static final Logger logger = Logger.getInstance(UpdateXmlFileCopyright.class.getName());
}
}