MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

do not create file templates dir if nothing changed

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-10-23 15:50:59 +02:00
parent 20c3418999
commit 4a31ed81f3
2 changed files with 42 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FTManager.java
+40 -53
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2015 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.
*/
// 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.ide.fileTemplates.impl;
import com.intellij.application.options.CodeStyle;
@@ -204,7 +190,7 @@ public class FTManager {
}
void loadCustomizedContent() {
final File configRoot = getConfigRoot(false);
final File configRoot = getConfigRoot();
final File[] configFiles = configRoot.listFiles();
if (configFiles == null) {
return;
@@ -259,10 +245,8 @@ public class FTManager {
}
private void saveTemplates(boolean removeDeleted) {
final File configRoot = getConfigRoot(true);
final File configRoot = getConfigRoot();
final File[] files = configRoot.listFiles();
final Set<String> allNames = new HashSet<>();
final Map<String, File> templatesOnDisk = files != null && files.length > 0 ? new HashMap<>() : Collections.emptyMap();
if (files != null) {
@@ -286,39 +270,45 @@ public class FTManager {
allNames.add(name);
}
if (!allNames.isEmpty()) {
final String lineSeparator = CodeStyle.getDefaultSettings().getLineSeparator();
for (String name : allNames) {
final File customizedTemplateFile = templatesOnDisk.get(name);
final FileTemplateBase templateToSave = templatesToSave.get(name);
if (customizedTemplateFile == null) {
// template was not saved before
try {
if (allNames.isEmpty()) {
return;
}
if (!myTemplatesDir.exists() && !myTemplatesDir.mkdirs()) {
LOG.info("Cannot create directory: " + myTemplatesDir.getAbsolutePath());
}
final String lineSeparator = CodeStyle.getDefaultSettings().getLineSeparator();
for (String name : allNames) {
final File customizedTemplateFile = templatesOnDisk.get(name);
final FileTemplateBase templateToSave = templatesToSave.get(name);
if (customizedTemplateFile == null) {
// template was not saved before
try {
saveTemplate(configRoot, templateToSave, lineSeparator);
}
catch (IOException e) {
LOG.error("Unable to save template " + name, e);
}
}
else if (templateToSave == null) {
// template was removed
if (removeDeleted) {
FileUtil.delete(customizedTemplateFile);
}
}
else {
// both customized content on disk and corresponding template are present
try {
final String diskText = StringUtil.convertLineSeparators(FileUtil.loadFile(customizedTemplateFile, CharsetToolkit.UTF8_CHARSET));
final String templateText = templateToSave.getText();
if (!diskText.equals(templateText)) {
// save only if texts differ to avoid unnecessary file touching
saveTemplate(configRoot, templateToSave, lineSeparator);
}
catch (IOException e) {
LOG.error("Unable to save template " + name, e);
}
}
else if (templateToSave == null) {
// template was removed
if (removeDeleted) {
FileUtil.delete(customizedTemplateFile);
}
}
else {
// both customized content on disk and corresponding template are present
try {
final String diskText = StringUtil.convertLineSeparators(FileUtil.loadFile(customizedTemplateFile, CharsetToolkit.UTF8_CHARSET));
final String templateText = templateToSave.getText();
if (!diskText.equals(templateText)) {
// save only if texts differ to avoid unnecessary file touching
saveTemplate(configRoot, templateToSave, lineSeparator);
}
}
catch (IOException e) {
LOG.error("Unable to save template " + name, e);
}
catch (IOException e) {
LOG.error("Unable to save template " + name, e);
}
}
}
@@ -358,10 +348,7 @@ public class FTManager {
}
@NotNull
File getConfigRoot(boolean create) {
if (create && !myTemplatesDir.mkdirs() && !myTemplatesDir.exists()) {
LOG.info("Cannot create directory: " + myTemplatesDir.getAbsolutePath());
}
File getConfigRoot() {
return myTemplatesDir;
}
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplatesLoader.java
+2 -16
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2015 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.
*/
// 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.ide.fileTemplates.impl;
import com.intellij.ide.fileTemplates.FileTemplateManager;
@@ -178,7 +164,7 @@ class FileTemplatesLoader {
for (final String path : children) {
if (!path.endsWith(FTManager.TEMPLATE_EXTENSION_SUFFIX)) continue;
for (FTManager ftManager : myAllManagers) {
File managerRoot = ftManager.getConfigRoot(false);
File managerRoot = ftManager.getConfigRoot();
String relativePath = configDir.equals(managerRoot) ? "" : FileUtil.getRelativePath(configDir, managerRoot)+"/";
String prefix = FileUtil.toSystemIndependentName(relativePath);
if (matchesPrefix(path, prefix)) {