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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yann Cébron
2016-04-26 20:49:28 +02:00
parent 6e65fedb4b 67d7150d7e
commit e4e8852912
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/codeInsight/template/NamingConventionMacrosTest.groovy
+1 -1
View File
@@ -41,7 +41,7 @@ class NamingConventionMacrosTest extends TestCase {
assert "a_b_c_d_e_f_g" == snakeCase("a-b.c/d|e*f+g")
assert "a_b" == snakeCase("a--b")
assert "foo_bar" == snakeCase("FOO BAR")
assert "" == snakeCase("0")
assert "" == snakeCase("")
}
public void "test lowercase and dash"() {
platform/lang-impl/src/com/intellij/codeInsight/template/macro/ConvertToCamelCaseMacro.java
+5 -8
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -43,16 +43,13 @@ public class ConvertToCamelCaseMacro extends MacroBase {
@Override
protected Result calculateResult(@NotNull Expression[] params, ExpressionContext context, boolean quick) {
final String text = getTextResult(params, context, true);
if (text != null) {
return convertString(text);
}
return null;
return text != null ? convertString(text) : null;
}
@SuppressWarnings("StringToUpperCaseOrToLowerCaseWithoutLocale")
@Nullable
@NotNull
@VisibleForTesting
public Result convertString(String text) {
public Result convertString(@NotNull String text) {
final String[] strings = splitWords(text);
if (strings.length > 0) {
final StringBuilder buf = new StringBuilder();
@@ -65,7 +62,7 @@ public class ConvertToCamelCaseMacro extends MacroBase {
}
return new TextResult(buf.toString());
}
return null;
return new TextResult("");
}
@NotNull
xml/impl/resources/liveTemplates/zen_html.xml
+1 -1
View File
@@ -72,7 +72,7 @@
</context>
</template>
<template description="" name="!" toReformat="true" toShortenFQNames="true"
value="&lt;!doctype html&gt;&#10;&lt;html lang=&quot;$ENV_LOCALE$&quot;&gt;&#10;&lt;head&gt;&#10;&lt;meta charset=&quot;UTF-8&quot;&gt;&#10;
value="&lt;!doctype html&gt;&#10;&lt;html lang=&quot;$ENV_LOCALE$&quot;&gt;&#10;&lt;head&gt;&#10;&lt;meta charset=&quot;$CHARSET$&quot;&gt;&#10;
&lt;meta name=&quot;viewport&quot; content=&quot;width=$WIDTH$, user-scalable=$SCALABLE$, initial-scale=$INITIAL_SCALE$, maximum-scale=$MAX_SCALE$, minimum-scale=$MIN_SCALE$&quot;&gt;&#10;
&lt;meta http-equiv=&quot;X-UA-Compatible&quot; content=&quot;ie=$IE$&quot;&gt;&#10;
&lt;title&gt;$TITLE$&lt;/title&gt;&#10;&lt;/head&gt;&#10;&lt;body&gt;&#10; $END$&#10;&lt;/body&gt;&#10;&lt;/html&gt;">