Attachment #113746 for bug #201413

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 201413
Collapse All | Expand All

Lines 157-162 Link Here

(-)a/web.el/src/org/netbeans/modules/web/el/completion/ELSanitizer.java (-1 / +13 lines)
157	if (ELTokenId.DOT == elToken) {	157	if (ELTokenId.DOT == elToken) {
158	return expression + ADDED_SUFFIX + spaces ;	158	return expression + ADDED_SUFFIX + spaces ;
159	}	159	}
		160
		161	// for COLON - e.g. #{foo:
		162	if (ELTokenId.COLON == elToken) {
		163	return expression + ADDED_SUFFIX + ELTokenId.LPAREN.fixedText()
		164	+ ELTokenId.RPAREN.fixedText() + spaces;
		165	}
		166
160	// for operators	167	// for operators
161	if (ELTokenId.ELTokenCategories.OPERATORS.hasCategory(elToken)) {	168	if (ELTokenId.ELTokenCategories.OPERATORS.hasCategory(elToken)) {
162	return expression + spaces + ADDED_SUFFIX;	169	return expression + spaces + ADDED_SUFFIX;
Lines 165-172 Link Here
165	return expression + " " + spaces + ADDED_SUFFIX;	172	return expression + " " + spaces + ADDED_SUFFIX;
166	}	173	}
167	}	174	}
		175
		176	// for COLON - e.g. #{foo:foo
		177	if (expression.contains(ELTokenId.COLON.fixedText())) {
		178	return expression + ELTokenId.LPAREN.fixedText() + ELTokenId.RPAREN.fixedText() + spaces;
		179	}
		180
168	return expression + spaces;	181	return expression + spaces;
169
170	}	182	}
171		183
172	// package private for tests	184	// package private for tests




    }

    @Test
    public void testSanitizeFunctions() {
        String sanitized = ELSanitizer.sanitize("#{foo:}");
        assertEquals("#{foo:x()}", sanitized);

        sanitized = ELSanitizer.sanitize("#{foo: ");
        assertEquals("#{foo:x() }", sanitized);

        sanitized = ELSanitizer.sanitize("#{foo:te");
        assertEquals("#{foo:te()}", sanitized);

        sanitized = ELSanitizer.sanitize("#{foo:te ");
        assertEquals("#{foo:te() }", sanitized);
    }

    @Test
    public void testFindLastNonWhiteSpace() {
        assertEquals(2, ELSanitizer.findLastNonWhiteSpace("foo "));
        assertEquals(2, ELSanitizer.findLastNonWhiteSpace("foo     "));

Return to bug 201413

Lines 157-162 Link Here

(-)a/web.el/test/unit/src/org/netbeans/modules/web/el/completion/ELSanitizerTest.java (+15 lines)
157	}	157	}
158		158
159	@Test	159	@Test
		160	public void testSanitizeFunctions() {
		161	String sanitized = ELSanitizer.sanitize("#{foo:}");
		162	assertEquals("#{foo:x()}", sanitized);
		163
		164	sanitized = ELSanitizer.sanitize("#{foo: ");
		165	assertEquals("#{foo:x() }", sanitized);
		166
		167	sanitized = ELSanitizer.sanitize("#{foo:te");
		168	assertEquals("#{foo:te()}", sanitized);
		169
		170	sanitized = ELSanitizer.sanitize("#{foo:te ");
		171	assertEquals("#{foo:te() }", sanitized);
		172	}
		173
		174	@Test
160	public void testFindLastNonWhiteSpace() {	175	public void testFindLastNonWhiteSpace() {
161	assertEquals(2, ELSanitizer.findLastNonWhiteSpace("foo "));	176	assertEquals(2, ELSanitizer.findLastNonWhiteSpace("foo "));
162	assertEquals(2, ELSanitizer.findLastNonWhiteSpace("foo "));	177	assertEquals(2, ELSanitizer.findLastNonWhiteSpace("foo "));