MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

WEB-37591 WEB-44955 Add tooltip, I18n captions and new preview file for HTML indentation

Browse Source 
GitOrigin-RevId: 147148c5756b11388073eb33b1e3af42a8cc2833
This commit is contained in:
Piotr Tomiak
2020-04-17 11:20:47 +02:00
committed by intellij-monorepo-bot
parent b48568b1a8
commit ea3e835d95
4 changed files with 107 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
platform/platform-resources/src/codeStyle/preview/preview.html.indent.template Normal file
View File

@@ -0,0 +1,102 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>WebStorm: The Smartest JavaScript IDE by JetBrains</title>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible"
content="IE=edge">
<meta
name="viewport"
content="width=device-width, maximum-scale=1">
<link href="/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png"> <link rel="canonical" href="https://www.jetbrains.com/webstorm/"/> <!-- .117-->
<meta class="local" content="A powerful IDE for modern JavaScript development with code completion and refactoring for JavaScript, TypeScript, and the most popular web frameworks." name="description">
<script>
var current_lang = 'en-us';
var i18n_info = {"current_lang": "en-us", "languages": [{
"code": "en-us", "label": "English"}, {
"code": "de-de", "label": "Deutsch"}]};
var english_only_url_prefixes = [];
</script>
<link href="/_assets/common.c3adb5a646375587a942.css" rel="stylesheet" type="text/css">
<style>
.page__beam._beam-1{-webkit-transform:translate(-40px,-700px);transform:translate(-40px,-700px)}.page__beam._beam-1 svg{position:absolute;left:50%;width:1244px;height:1250px;margin-left:-622px}
</style>
</head>
<body class="nojs ">
<div class="page">
<div class="page__header">
<header class="menu-main header" id="js-menu-main">
<div class="wt-container">
<div class="wt-row wt-row_nowrap wt-row_size_s wt-row_align-items_center">
<div class="wt-col-auto-fill">
<a class="menu-main__logo-link" href="/"></a>
</div>
<div class="wt-col-inline wt-display-md-none menu-main-skeleton-text-1" style="min-width: 69px"></div>
<div class="wt-col-inline wt-display-md-none menu-main-skeleton-text-1" style="min-width: 81px"></div>
<div class="wt-col-inline wt-display-md-none menu-main-skeleton-text-1" style="min-width: 46px"></div>
<div class="wt-col-inline menu-main-skeleton-button"></div>
<div class="wt-col-inline menu-main-skeleton-button"></div>
</div>
</div>
</header>
<div class="menu-second " id="js-menu-second">
<div class="wt-container">
<div id="js-menu-second-mobile-wrapper" class="wt-display-none">
<div id="js-menu-second-mobile">
<div class="menu-second-mobile wt-row wt-row_size_m wt-row_align-items_center wt-row_justify_between ">
<div class="wt-col-inline menu-second-skeleton-text-2" style="max-width: 120px"></div>
<div class="wt-col-inline menu-second-skeleton-button" style="max-width: 80px"></div>
</div>
</div>
</div>
<div id="js-menu-second-desktop" class="menu-second-desktop
wt-row wt-row_size_0 wt-row_align-items_center">
<div class="wt-col-auto-fill">
<a class="menu-second-title-box"
href="/webstorm/">
<span class="menu-second-title-box__logo jetbrains-logo">
<svg class="_webstorm sprite-img" xmlns:xlink="http://www.w3.org/1999/xlink"><use xlink:href="#webstorm"></use></svg>
</span>
<span class="menu-second-title-box__title wt-h3 ">WebStorm</span>
</a>
</div>
<a href="/webstorm/whatsnew/"
class="wt-col-inline wt-text-2 wt-text-2_hardness_average menu-second__link">
What&#39;s New
</a>
<a href="/webstorm/features/"
class="wt-col-inline wt-text-2 wt-text-2_hardness_average menu-second__link">
Features
</a>
<a href="/webstorm/social/"
class="wt-col-inline wt-text-2 wt-text-2_hardness_average menu-second__link">
Blog &amp; Social
</a>
<a href="/webstorm/buy/"
class="wt-col-inline wt-text-2 wt-text-2_hardness_average menu-second__link">
Buy
</a>
<a href="/webstorm/download/"
class="wt-col-inline menu-second__download-button wt-button wt-button_size_s
wt-button_mode_primary">
Download
</a>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

3
xml/impl/src/com/intellij/application/options/HtmlIndentOptionsEditor.java
View File

@@ -4,6 +4,7 @@ package com.intellij.application.options;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings.IndentOptions;
import com.intellij.psi.formatter.xml.HtmlCodeStyleSettings;
import com.intellij.xml.XmlBundle;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -15,7 +16,7 @@ public class HtmlIndentOptionsEditor extends SmartIndentOptionsEditor {
@Override
protected void addComponents() {
super.addComponents();
myUniformIndentCheckBox = new JCheckBox("Use HTML indents within <style> and <script> tags");
myUniformIndentCheckBox = new JCheckBox(XmlBundle.message("checkbox.uniform.indent"));
add(myUniformIndentCheckBox);
}

2
xml/impl/src/com/intellij/application/options/HtmlLanguageCodeStyleSettingsProvider.java
View File

@@ -49,7 +49,7 @@ public class HtmlLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett
@Override
public String getCodeSample(@NotNull SettingsType settingsType) {
return CodeStyleAbstractPanel.readFromFile(this.getClass(), "preview.html.template");
return CodeStyleAbstractPanel.readFromFile(this.getClass(), "preview.html.indent.template");
}
@Override

3
xml/openapi/resources/messages/XmlBundle.properties
View File

@@ -333,4 +333,5 @@ options.xml.attribute.descriptor.tag.data=Tag data
action.name.show.history.for.text=Text
options.html.attribute.descriptor.tag=Tag
inspection.javadoc.html.not.required.label.text=Additional Not Required Html Attributes:
inspection.javadoc.html.not.required.dialog.title=Edit Additional Not Required Html Attributes
inspection.javadoc.html.not.required.dialog.title=Edit Additional Not Required Html Attributes
checkbox.uniform.indent=Use HTML indents within <style> and <script> tags